Merge "Add ConnectivityAnnotations class" into sc-dev am: d2d8fa6c17 am: 329aede902

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

Change-Id: I45df58f58e096f27fa6bb2e1b359c514e68206fe