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

* commit '05b11bf357be9546a2cbdd3f37c32fc9567f4767':
  Update message in SIM PIN view when configuration changes