Merge "DO NOT MERGE Fix broken test" into rvc-dev-plus-aosp am: 0d050d0f5d

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

Change-Id: I4cd331da42711bc5f45ea021e87ab42f8f540923