am b5b67779: Merge change I7fa8c508 into eclair-mr2

Merge commit 'b5b6777903d85349cf4baa07a54e1629551ea712' into eclair-mr2-plus-aosp

* commit 'b5b6777903d85349cf4baa07a54e1629551ea712':
  make erase-password-on-SIM-change optional