Merge "Fix error message shown when SIM PIN enable/disable fails" am: f29392303a am: 8bac59265e
am: 6293483fce

Change-Id: I5b533e911f1185bb9fe1847701e333093b49926e