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

Bug: 205056467
Merged-In: I5abff7ded19dcf8d52d2dbf68de99f0da2027bc3
Change-Id: I79a5830f0cded282ad6b8779ee0e3571040872b1