Merge "Merge "Kill off callback reference as soon as credential is verified" into rvc-dev am: 998df4f3 am: 13dbfb28 am: 5b11cac4" into rvc-qpr-dev-plus-aosp am: b27b924a

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

Change-Id: I50d2759287815de95ec5d78a656485053f8f21c2