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

Bug: 205056467
Merged-In: Iaecebbb4920b9e4b49b774e9e5498751b02735b8
Change-Id: I931120e34f83ca3f667d94d1cf09659908b41463