Merge "Fix the owner of RescuePartyTest" into main am: ec3d9ab964 am: d385c39b9f

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

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