Merge sc-v2-dev-plus-aosp-without-vendor@8084891

Bug: 214455710
Merged-In: I900e4748546ee47f80f840fb7d9ec2860c1e4e91
Change-Id: I8e281e376b53973c22b137aa7bb33085a9b5db7f
tree: 9110130c0f6ed247f889c42635876b31c2ed4552
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. CleanSpec.mk