[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: f1dbf2bd5e
-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: I861eaf0ca9e26c3793169399f287cfc6351e312b
This commit is contained in: