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

Bug: 205056467
Merged-In: I19ac34cd601e583d714f0678210631932a48c184
Change-Id: Ie14ccd6eaa7eab203f49b50b588da26dd8df29b3
tree: 4852275c264528b96875e243151edd4cc66b92f6
  1. .prebuilt_info/
  2. 1/
  3. current/
  4. OWNERS