[SP28.2] Add shims to allow test utils built against different SDKs am: ccd68dc9c9 am: ec3c6f19f4

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

Change-Id: Ic0e5a7d8bb7b33edf03b93ae447383f87a16f28c