Merge "Merge "Fix broken test" into rvc-dev am: 95e41f27 am: fb12099a am: 45d5c4a5" into rvc-qpr-dev-plus-aosp am: 59fa0642

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

Change-Id: I512fde5a0c1554df1328a4e2bb7bd727196d2aeb