Merge "Move util classes to their destination package" am: d26b6ece94 am: dd531093f8

Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1352182

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7cdc14af7bde6aee73225d35d3eaa330dbafa28b