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: 13dbfb28

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

Change-Id: I6586d79f3e1f9cbd71f89414c5432acb41e5a933