am e7896371: am f7b541ff: Merge "Do not report WiFi and Bluetooth MAC addresses - framework." into mnc-dev

* commit 'e78963712e59963b2c6e3b2082231879fe8ba737':
  Do not report WiFi and Bluetooth MAC addresses - framework.