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

Bug: 205056467
Merged-In: Ibe04f61c023e34b15bc2d0257cab5dcae57b96b6
Change-Id: I4d910beaa4d59b56324f00e8b838146323943773