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 am: 5b11cac4

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

Change-Id: I6bd8a5abfb4fd4d82ca2956fd17672f1a44ebd52