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

Bug: 205056467
Merged-In: I40bef9eb41bfedf73ac4bd0ff0050833d2a9623c
Change-Id: Iae5e73b18d8885df51c1fca1ef27e277721a8237