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

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