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

Bug: 205056467
Merged-In: I604b9bebaabadb768c7429d5fb4aa28cd702f477
Change-Id: Ia773cbd0c0447a31ba2a9adce81a004258bb6e4e