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

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