[automerger skipped] Merge "Fix new NewApi lint warnings" am: 64a1c22cc2 -s ours

am skip reason: Merged-In I18a45af43d5dde70e7d42611b0d0e77cf053202b with SHA-1 e93f28da57 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Wifi/+/1859743

Change-Id: Id7840f22efb7e7d4827e4e0e9f8aeb0d6a671f01