Merge SPL-2019-12-05

Change-Id: I33496b4e0ae52eb3d1054e8138d5b938f9b62822
tree: 16f29b7580da0d7b03c434d56fc9d7573d410844
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS
  6. proguard.flags