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

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

Change-Id: I83fc58bf7e47379f9b03205765d73cd1483732cd