Merge "Merge "Alert ProxCheck listeners directly when timing out." into...

Merge "Merge "Alert ProxCheck listeners directly when timing out." into rvc-d1-dev am: 350583be am: b20a5077" into rvc-qpr-dev-plus-aosp am: 67c210eb

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

Change-Id: I4189282cf74f5e100e48434324b61afd6b7fc594