am d5ba9c22: Merge "resolved conflicts for merge of 17f95e92 to honeycomb-plus-aosp" into honeycomb-plus-aosp

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