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

Bug: 205056467
Merged-In: I029d46edde5b61f20241bab46b97d58c5fe71702
Change-Id: Ifa5a267a9b4096b58fa2577c78e0976145996749
tree: 9dab87d125f7b9fcab12f66a32ce6bf1ec68166d
  1. .prebuilt_info/
  2. 1/
  3. current/
  4. OWNERS