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

Bug: 205056467
Merged-In: Id217503f7f4423df25ae89eea305c2b2d3412a6a
Change-Id: I56d07533e37da2e302ed2cc7efcb3de52651e8cb