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

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

Change-Id: I9283ffb72e4581b0d10f82c04968c1ee1606cbc1