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

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