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

Merged-In: Ib71ec848048d4a921b0086d3432797c885ac98ed
Change-Id: I9485983135ab1e4b8bbb75e9ede620afd7b5a605
tree: b0b928a9c8b07371c67f14c5fb00d6b25fe9166b
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. CleanSpec.mk
  7. NOTICE