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: de3244d3" into sc-v2-dev-plus-aosp am: 30064aea

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

Change-Id: Icc03301fba93bdf6f59baf29d31e32770c59a55c