am 661e9b37: Merge "remove the code that clears the passwords when the sim is replaced with a different one." into gingerbread

* commit '661e9b371fcc1a2aec5dfd74f2cc65db1d8a77d5':
  remove the code that clears the passwords when the sim is replaced with a different one.