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

Merged-In: I9a5853741a07261d954816e170e6db90b1f9a573
Change-Id: If1994d3809629429ecb684d6f58b2cbd28fddd22
tree: e9700fa34e5e575576b01f4753f83afe9bec1f24
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. NOTICE
  7. OWNERS
  8. proguard.flags