Merge "Fixing RescuePartyTests" into main am: 25d36a4916

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

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