Merge "Rename one of the two EVENT_NETWORK_TESTED messages." am: 4b654c9038 am: 52c9911e18

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1989916

Change-Id: I8349684a1b7ad749cc4c7a16252a97fdab4875f7