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

Bug: 205056467
Merged-In: I39bc668a5671cce94372063246c13bc09dd569fa
Change-Id: Ic5d56619c6d4baea7610bfe80293cb8616acbd47