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