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

Bug: 205056467
Merged-In: Ic7c23992a2fc04a795db5c936c5089c04aea8f61
Change-Id: Ib1dfee83fa60e2f3530a504fd7a22c539e2a34d8