Merge "Add framework-annotations-lib to Wifi service deps" am: 5318227f2a am: 460ec06864 am: 78dc59fa0a am: 1eea757a9b am: 17ddd9db75

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1875776

Change-Id: I7090deaa756876ac71189a5452ef99cbe714cbc9