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

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