Merge "Remove dependency on compatibility-device-util-axt" am: efce8e6e32

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

Change-Id: I9effc8b27171a29a4de7e027e5dcb35419effe5c