Merge changes from topic "qprpassthrough-rvc-qpr-dev" into rvc-qpr-dev am: 8d708d59 am: 7c390319

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12792551

Change-Id: I1c318c2fd2123accb59c7920ecb619bd7237b784