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

Bug: 205056467
Merged-In: Ie7bebd7d9945fafaeddf75138a54172d709d5b0d
Change-Id: I9d3c0e658f50236aa19f3f17f3aad276afc4ac68