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

Bug: 205056467
Merged-In: I6074236616646db7bfda7ea381af7b04775a4263
Change-Id: I8fbe24c4eafe4eccb1f552d8688e0b91ce1060c5