[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: be2c54c3e4 -s ours am: a693ba8df2 am: 9a3d1de220
am: 1ceed51173 -s ours
am skip reason: subject contains skip directive

Change-Id: I2484f6d8e339094139988166f1a81444852ee4d0
tree: 2b5837b769528abd1ae14740282bd1260cdfa55f
  1. bootctrl/
  2. libhwcomposer/
  3. Android.bp
  4. OWNERS