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

Merged-In: I3d2d80ed53c5726a35a7d1ca43cafe9c45c127f4
Change-Id: I5f79c277a76c4994914c6e7611338dded991644f
tree: eb245a3f4bd1ee407d13573318e21184366c3f71
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS
  6. PREUPLOAD.cfg