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

Bug: 205056467
Merged-In: I86752f113f98ce61995c4e56a48c39d3c6913197
Change-Id: Id8d7ebe4ef8775a165694b430a260756de188326