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

Bug: 205056467
Merged-In: I276f3a2d55527e048aa3c3cb60414a5676372010
Change-Id: I0878256c0ab88313ee1620296f42751bb23714d8