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

Bug: 205056467
Merged-In: I46f1b2cd2b169542e6cc7fd2f1327201ec8be052
Change-Id: I4c39ee68c06f35c5ac50eb36da46dfd30279b75a