09074df188
This CL merges rvc-qpr-dev-plus-aosp on top of sc-dev-plus-aosp on top of mainline-prod. It picks up changes that were merged into aosp/master before sc-dev-plus-aosp was on the path between AOSP and master. One such very simple CL is aosp/1554765. There were no merge conflicts. Current diffstat with aosp/master is: 97 files changed, 2219 insertions(+), 84 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: I63af0b95e2d0e6bddc217c29014c03ea0dbda6ec Merged-In: Ib0ac49609e444a53a6fee4575f5078e15f364eef