Merge "Fixing the broken test" into main am: 29ea2b5a am: e52665c1

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



Change-Id: I5bdd4c7a67185c015d41dbca226c5137d472a155
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>