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

Merged-In: I91a2cd8d51f1df6ac6fa53eb707800f3ecae12b6
Change-Id: If0a2b824f3f1d1e1052eda860e2a58106406118b
tree: 0ab2c9d0553008a7d24fc7c557e20a6361df03dd
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. OWNERS
  7. proguard.flags