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

Bug: 205056467
Merged-In: I1b7c07dbf6e15baa783199aff5d299859c838ba2
Change-Id: I7b1ca7d71f18b16fa6db39ba556eb1106746c83b