Merge "Kill off callback reference as soon as credential is verified" into...

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

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

Change-Id: Ib11bd96e4387bb1040b93c837c61500f83bf5f74