Merge "Merge "[conflict] Merge "Fix SessionLifecycleTest" into android11-tests-dev am: 7e8adf861b" into android12-tests-dev am: fafd71d217" into android12L-tests-dev