Merge "Fix error message shown when SIM PIN enable/disable fails"