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

Merged-In: I3df22a44ee75fa2f55e1329d749e92d7d2f8a0ef
Change-Id: I41164ccc5c7eeb1bbc85b071bb79a3a39ddd6ec6
tree: 16b13060335e22ac3e8fc103fcfb15aece0ab0aa
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. NOTICE
  6. OWNERS