Merge SP1A.210811.001

Change-Id: I5657bc12f801029fa450177adb5dc274a18f565e
tree: b561174c2a91038cc49bad019682f009c4690f25
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. NOTICE
  7. OWNERS