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 am: 603cc36a

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

Change-Id: I6af273d82d4bfc5499d92cedf0965cb0d94797b0