Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918

Bug: 205056467
Merged-In: Id2437a4e08802fa9cc21d9ed0d9ea03ab15d618b
Change-Id: I44bd5b37f119442aee02dd5559fb437dafa1dab5
tree: f50138b0cb1c05e8412ed0b2386eae1f151a84bb
  1. .prebuilt_info/
  2. 1/
  3. current/
  4. OWNERS