Merge android10-qpr3-release to aosp-master - DO NOT MERGE am: e403d8f05a

Original change: https://android-review.googlesource.com/c/device/google/wahoo-kernel/+/1356004

Change-Id: I090ef8cd0dbbd0991d34967f53f3f2adf4b791d2