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

Bug: 205056467
Merged-In: I074cceba05c05c61c1e118d639684010faabecfc
Change-Id: Id0a35797d5016e3fb3f8d58a75ff84a55eb413e7