Merge "Fix Rescue Party observability criteria" am: 51704f4d07

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

Change-Id: I702c2893aab576fd798de0d0878788e855c39801