Merge sc-dev-plus-aosp-without-vendor@7634622

Merged-In: Ia9ada79949f5b6613a08c2b8cb1df6d10f09212a
Change-Id: I565346d42353a9cc63ef73242068f001df661d1f
tree: 143388bce5f5d402d80feb4847349f3845b78883
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. NOTICE
  6. OWNERS