Merge "Clean up getAttributionTag" into main am: d7f747dd4a

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

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