1498ad9ac1
This CL merges sc-dev-plus-aosp into mainline-prod. It picks up changes that: - Were merged into sc-dev and automerged into sc-dev-plus-aosp - Were merged into aosp master while sc-dev-plus-aosp was on the path between AOSP and master. It does not pick up changes that were merged into aosp before sc-dev-plus-aosp was on the merge path from AOSP to master. One such very simple CL is aosp/1554765. There were no merge conflicts. Current diffstat with aosp/master is: 161 files changed, 2923 insertions(+), 4005 deletions(-) This includes 1800 lines of translations added in 72 files like Tethering/res/values-*/strings.xml Bug: 167645754 Test: no merge conflicts Test: didn't even try to build Ignore-AOSP-First: this is a merge from AOSP Change-Id: Ie82ff0d3fcb82f0d66534b114af9f240f5574bfb Merged-In: Ib0ac49609e444a53a6fee4575f5078e15f364eef