Merge "[automerger skipped] Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master am: e7449820 -s ours am: 0595a3bf -s ours am: a75effc5 -s ours" into sc-v2-dev-plus-aosp
