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

Bug: 205056467
Merged-In: I788344419e2eee44443f4e4cc342c0de11632be1
Change-Id: I5646901310b1463cd52da34fcecfcd756a18452e