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

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

Change-Id: I5658e5a135cc178ee0e2efb62d08e2da8a39021f