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

Bug: 205056467
Merged-In: I51805b647462ab980a099ad630007569cef8966c
Change-Id: I4517f8cd3491de8bbc11cc57512220bc9a18b3c5