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

Bug: 205056467
Merged-In: I637b82fd2c57ac45b5c28b74941cf1c80235e844
Change-Id: I855f1f0b6bd10d54941d56889eb6b025ac11a693