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

* commit '2ce65bddb50ecd376cc4eafdc9853b6bf50ac970':
  Catch & log security exception in telephonymanager