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