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

Bug: 205056467
Merged-In: I591c1a3955f70926d5e814b5c0e088706658d174
Change-Id: I904aadc2fbbb180b57c1b7ff6454dbf0e510b38d