am e81e42d7: (-s ours) Reconcile with jb-release - do not merge

* commit 'e81e42d7a6bb1bc7b29d0a7d475f750b524e3fec':
  Show plmn in emergency call allowed mode.