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

Bug: 205056467
Merged-In: I5a7cddac4f7dc3706d94b8fa2879e02c7c1a0195
Change-Id: I7f616aa146cc991359513b2e2ca9cab578f6e085