Merge spl-2021-03-05

Change-Id: I327bc7a1ea677f2b0e9203c1439fd974546ea70a
tree: fa207422c512678733e48ae0d306cdf924285346
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. build.gradle
  6. OWNERS