Merge "[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 818495e295 -s ours am: 47fb2759e4 -s ours am: dea81b4162 -s ours" into sc-v2-dev-plus-aosp