Merge "Removes unnecessary class prefixes for cleaner code referencing" into main am: 2c4f3bed66

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

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