[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into master"
am: c40dd9b4e8 -s ours
am skip reason: subject contains skip directive

Change-Id: Id8cf1b68b38b9155edacda795eeb5ec886bf1508
tree: 006e6312c1fc766ec447fdd7925d738a4c989bef
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS