Merge SP1A.210616.001

Change-Id: Ia68e9eef1a680a574534b46319a9e6b88dfb6237
tree: cff49d2eea12a3f8d7ea7abc319fba6f8ccdfaf3
  1. .prebuilt_info/
  2. 1/
  3. current/
  4. licenses/
  5. sdk_library/
  6. Android.bp
  7. OWNERS