Merge changes Iab731cd7,I24dd2952

* changes:
  SarManager: Copy @hide constants for STREAM_DEVICES_CHANGED broadcast
  wifi-service: Link against service-stubs
tree: 3b2091d54d09e1d2663e2e364e53c0b90f8de278
  1. apex/
  2. service/
  3. PREUPLOAD.cfg