am b56a70b7: am aea0d1d6: Merge "Make the intent of network operator settings notification configurable." into cw-e-dev

* commit 'b56a70b7d35e85e5460c7dc99820b237711f8086':
  Make the intent of network operator settings notification configurable.