[automerger skipped] Merge "The text on toast should be changed when remains 1 time for SIM lock input" am: 37a0c3873f
am: 4d01040160
-s ours
am skip reason: Change-Id If4b53bbbc6b51582bc0837abf4497d9a75ebbaad with SHA-1 9c69ded434
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1393239
Change-Id: Ie88640e9331b88eb45be68242ee9cdbfb5d752a7
This commit is contained in: