Merge "[automerger skipped] Merge "String change for ConnectionFailureNotifier" into qt-qpr1-dev am: 5e52236b -s ours am: 0527108a -s ours am: c1981d4c -s ours" into rvc-d1-dev-plus-aosp