Merge spl-2020-06-05
Change-Id: Id7fb6191f89cb142da164df31f5595a285c41bb9
tree: 2c19bcce8a72a56050348723f82f4f593faeb748
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. build.gradle
  6. OWNERS