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

Bug: 205056467
Merged-In: I7dcf2f2d523b501e90fc99c024071521e4cf067b
Change-Id: Id416dddc28b876aaca684dbc9ceff21e31a7dd5e