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

Bug: 205056467
Merged-In: I2d3f9c89ea02f7c813841ba1d5b376d7c0f977bf
Change-Id: I325e71d4f7ba1fbf8dfbe2c7dff3067520a799fd