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

Bug: 205056467
Merged-In: I2755ac80e8734712584594e084df533d6e141ecd
Change-Id: Iba6346b46f2a28bb7b2e71b691a18758cfde2995
tree: 81fda29013042a15ddb72c5f12a65add4ea132f4
  1. .prebuilt_info/
  2. 1/
  3. current/
  4. OWNERS