Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master