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

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

Change-Id: If286e563a957ebbef1bf82d55352a64f79cc1ef4