Merge "Make constants static import" am: 0c8d808117

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

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