tree bf09ee7afa260f7ad7897add2d9c91aaf395d08f
parent d9d3a6ce10a3a66df8c6f3803790643654c446f1
parent 6b37630902f7e341de8979176462d399278b5db8
author Gavin Corkery <gavincorkery@google.com> 1603281187 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1603281187 +0000

[automerger skipped] Merge "Fix Rescue Party observability criteria" am: 51704f4d07 am: 8d1462d5eb am: 6b37630902 -s ours

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

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

Change-Id: I6051bc1c6642df8bd460f40f2baf58ba5514b5ac