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

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

Change-Id: Ie6ee189d4c148c57f76d2ae6359425614d74ab9a