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

Bug: 205056467
Merged-In: Ie28dd86130c2ba475fcdc5336a232ca9cdd986ab
Change-Id: Ic4403e3a9fbe9d9bf04cfe5549bb0e580ccedb2e