am bfca5f40: am 266303fd: Merge "Avoid SecurityException when calling getUserData" into lmp-mr1-dev

* commit 'bfca5f40eb9e5d888218c615fa744e5d8ea2d207':
  Avoid SecurityException when calling getUserData