Merge "Merge "fix SelfManagedConnectionTest failures" into android12L-tests-dev am: 8147c8ddcb"