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

Bug: 205056467
Merged-In: I63d1b17cef1815a43fc91a31c284bc81f6dd8ba9
Change-Id: I478950609400b6b2153c38fc7ea13143dbd1d419