Merge "Suppress NewApi warnings for @SystemApi -> public APIs" am: 91fbc03707 am: 03c6cebab9 am: 544ee064fb

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

Change-Id: Ie0067d2a598311704bda6986567cdade5f1e47a5