am 27f26df6: am 05b11bf3: Merge "Update message in SIM PIN view when configuration changes" into mnc-dr-dev

* commit '27f26df629e7a5c2ea87ad46708dc4678c11d27a':
  Update message in SIM PIN view when configuration changes