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

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

Change-Id: I168c5b437e4f6c14848be0747d5ec0a2c2dd8e0d