Merge SP1A.210616.001

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