Merge "Move static utils to the static library" am: 0fdd516a82 am: f13acd2190

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

Change-Id: I8766e5b69c86d5319f63cf7a01a80cc9be10925d