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