Merge "Update ConnectivityDiagnosticsCallback function name." into rvc-dev am: e09e0db478 am: 72e42fd09e

Change-Id: I471a9ef0051a1bbd964c66d94d167e8610da4357