Merge "update CRITICAL annotations for mainline" am: 869c4ad452 am: b8e7ede9f6

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

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