Merge "Ensure authentication lifecycle ends for callers" into sc-dev am: a0df5a94 am: 7886ee41

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

Change-Id: I0a91c06b94716f5a937c52a9109d09a5742bf5ef