Merge "Fix RescuePartyTest" into main am: bf6d630ff4 am: 3d148eeead

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

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