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