Merge spl-2020-12-05

Change-Id: I26d4bd5ad0546579bdfa6a68813e631c4fd74ef0
tree: 01dbef8d61626d66e207c5754d227cdca3e43738
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. OWNERS
  7. proguard.flags