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

Bug: 205056467
Merged-In: I92c020098293b42b3218ba67d55726e23c0b4835
Change-Id: I445bc5cf4a2499637fd07e5f4ff339fbefb397bd
tree: 60e0f54cdd85116653bc5757d45c977f9726fd6f
  1. .prebuilt_info/
  2. 1/
  3. current/
  4. OWNERS