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

Bug: 205056467
Merged-In: I302491d47346aa48eebcac6498991fda95f62b58
Change-Id: I5856239090b68ed605ec97215342884147a0883b