Merge "Ensure authentication lifecycle ends for callers" into sc-dev am: a0df5a941b

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

Change-Id: I3ac9db0763ec34ab2d9100cdc565d636861a7f75