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

Merged-In: I10e7e7fc2d7f3d52648a4b46463e1be6c6a6300c
Change-Id: I8305f8550f0a33d0b5a98035d040ef1ca2bf7a72
tree: 0e3d372b36f4960d9a26fa32790ab9df8219f22e
  1. src/
  2. Android.bp
  3. AndroidManifest.xml
  4. OWNERS