Merge changes from topic "am-6f00d3890c6548cb976df6ad5b8078e6" into tm-qpr-dev-plus-aosp

* changes:
  Merge "[automerger skipped] [automerge] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock 2p: 1e7087f1 am: 1bc51470 -s ours am: c64e0d70 -s ours am: aff81a55 -s ours am: 1b1dc203 -s ours" into tm-d1-dev-plus-aosp am: fd2105e9 -s ours
  [automerger skipped] [automerge] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock 2p: 1e7087f1 am: 1bc51470 -s ours am: c64e0d70 -s ours am: aff81a55 -s ours am: 1b1dc203 -s ours am: 796ed1f9 -s ours