Merge "[automerger skipped] Merge "Merge sc-v2-dev-plus-aosp-without-vendor@8084891" into stage-aosp-master am: a6a261b1 -s ours" into sc-v2-dev-plus-aosp