am 5eb7fd29: am ff5c6fde: am 2ce65bdd: am cf01fd0f: Merge "Catch & log security exception in telephonymanager" into mnc-dev

* commit '5eb7fd29da2254bdc45f2d09d5bc59292ee0cc99':
  Catch & log security exception in telephonymanager