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

Bug: 205056467
Merged-In: I513a17f21790c3efa57c2896523723afd843bfb0
Change-Id: I60bbf6e9a6d80526faaaee0c9ccf82205fcabd27