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

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

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