Merge "Remove unused ConnectivityAnnotations" into main am: 013acc568b

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2984132

Change-Id: Ic29649be05f81cdc5b6247cbb9818d2f415bff24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>