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

Bug: 205056467
Merged-In: Ia388335f557aa36fdf615e7877f33362e8233c78
Change-Id: I6f445644a3f941fc9337c5236f5ab5a18fad24ee