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

Merged-In: Ice4076814a54950e4a9ad8efeac4eb2f2531c75f
Change-Id: I0311e0abb454fc9b7bdb1e9aaa5a380d6505830e
tree: 4d7de047995939d5a5c11340f974a9262726993c
  1. res/
  2. src/
  3. tests/
  4. tools/
  5. Android.bp
  6. AndroidManifest.xml
  7. OWNERS
  8. PREUPLOAD.cfg