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

* commit 'cf01fd0f128a2d7fc5b9c0f9db4fc9e0e5552093':
  Catch & log security exception in telephonymanager