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

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

Change-Id: Ieeb7e0a9b0083ff276d4baeeda4a0b14397449fd