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

Bug: 205056467
Merged-In: I129ee68719302e29045bb2aa13093c2864f305af
Change-Id: I4fa8e7e32a61d5850dac19062615ea20b6d4d0d1