Merge SP1A.210616.001

Change-Id: Ia126eb32f9d606e3ff452b9fbdbdc58bece3d5a4
tree: e201a2bdba950af193b1b1f43aa54f0454bfb1af
  1. build/
  2. java/
  3. javatests/
  4. tools/
  5. Android.bp
  6. OWNERS
  7. PREUPLOAD.cfg
  8. TEST_MAPPING