Merge "Kill off callback reference as soon as credential is verified" into rvc-dev am: 998df4f3

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

Change-Id: Ieca4a69c34de46fc627703148de04a2f5ea3495a