Merge "Merge "Ensure authentication lifecycle ends for callers" into sc-dev...

Merge "Merge "Ensure authentication lifecycle ends for callers" into sc-dev am: a0df5a94 am: f69b24a5" into sc-v2-dev-plus-aosp am: 281094c6

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

Change-Id: Ib5cc2f6e335dd3e479780f1bb9181f528a0ed337