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

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