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

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