[automerger skipped] Merge "Fix Rescue Party observability criteria" am:...

[automerger skipped] Merge "Fix Rescue Party observability criteria" am: 51704f4d am: 8d1462d5 am: 6b376309 -s ours am: e38da9ba -s ours

am skip reason: Change-Id Ifec19b8daba1dacc7f5efcfa47ed3c3a046612e3 with SHA-1 f2abc4e6 is in history

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

Change-Id: I9bd3e42d5bce67f12d9674e3cf88e04802fce04a