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

Bug: 205056467
Merged-In: I317342f66ebab949158f9d8480f57eacfa5c786d
Change-Id: I618a1982de47f98ec852ca1158b713f30805685e