Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master

No content change.

Bug: 135460123
Change-Id: Ic8cbefbf3c8f4fee7597c6f599a5d6679ea2d820
Merged-In: I7ac6c92e1b64ccf5860de04b17a448046e1af8fe
tree: 2b5837b769528abd1ae14740282bd1260cdfa55f
  1. bootctrl/
  2. libhwcomposer/
  3. Android.bp
  4. OWNERS