Merge "Fixing RescuePartyTests" into main am: 25d36a4916 am: 56db1fde24

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

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