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

Bug: 205056467
Merged-In: I27cece8320b92d25e5e10dddfd541f7aeb56527f
Change-Id: I404ee8c2afe5ca547526c29b0aa6e079db15bc1d