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

Bug: 205056467
Merged-In: I08555be1d7daa6ec2008aca816d78471998ecb55
Change-Id: I6e1de05da24275d9107c971923a164a9ed02f9b3