Merge "Fix RescuePartyTest" into main am: bf6d630ff4

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

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