Merge "Fix SessionLifecycleTest" into android11-tests-dev