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

Change-Id: I57b650735d42c396f5b71cfb2afc0650dd6f111f
tree: c95c0943b67ec5c458a51b51f11e82cac5315206
  1. 1.1/
  2. extns/
  3. halimpl/
  4. Android.bp
  5. OWNERS