Merge "Add framework-annotations-lib to Wifi service deps"