am d8d21279: Merge "Don\'t allow monkey to play with SIM lock settings. Bug #...
am d8d21279: Merge "Don\'t allow monkey to play with SIM lock settings. Bug # 2358489. DO NOT MERGE" into eclair
Merge commit 'd8d21279' into eclair-plus-aosp
* commit 'd8d21279':
Don't allow monkey to play with SIM lock settings. Bug # 2358489. DO NOT MERGE