[automerger skipped] Merge SPL-2019-12-05 skipped: 94fa220924

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