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

Bug: 205056467
Merged-In: Ic8aa998eaea5817b05635c43341d6a349c1b767d
Change-Id: Ie0cc52730d55eb6fbfec32c5f81d7fc1f67c62eb
tree: cdd2af48218c6260a33265577f5c2a9c58ad40e1
  1. .prebuilt_info/
  2. 1/
  3. current/
  4. OWNERS