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

Merged-In: Idee67b0816da8a217495a1849b63ada58cdfc936
Change-Id: Icbad3b6b144a9a58d38289127fed45e3887a26f8
tree: e61f5214bc0695b86de01dde68f3d5cca511e4c2
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS