Merge "Fix Rescue Party observability criteria" into rvc-qpr-dev am: a4d6ee2b00 am: 54fdfae7a6

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

Change-Id: I30e26d7129f6b8f106e5d3a81aae2f07fa6c4201