Merge stage-aosp-master into pi-dev-plus-aosp

Bug: 126125118
Change-Id: I518b0c59a7e5d1e6b2df455ab7c7360a5033f9fa
tree: a5f8581c03fa21788ce0df3f7874c47d89d165c1
  1. bootctrl/
  2. libhwcomposer/
  3. Android.bp
  4. OWNERS