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

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

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