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

Bug: 205056467
Merged-In: I977dda270d2e37cee5b417c1d68d0605987730db
Change-Id: I080b255ffc6f60a7d3985c36b44f3328ae689c0e