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: I3b15bf5acb23746ddad579b9b35f8eb2283169f7