Merge "Suppress NewApi warnings for @SystemApi -> public APIs" am: 91fbc03707 am: 0f27cf47f2

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

Change-Id: Icd643cdb1ffd5bf949002c2d9a73ea794a7b1866