Merge changes from topics "framework-wifi-jarjar", "framework-wifi-jarjar-more-classes"

* changes:
  SystemService annotation: Remove import of Context
  Jarjar more classes into framework-wifi
  Jarjar utils into framework-wifi and share with wifi-service