[automerger skipped] Merge "Log when PUK is empty" am: f832dd72 am:...

[automerger skipped] Merge "Log when PUK is empty" am: f832dd72 am: 8a0fd64e am: ce20722f am: 5a5cd156 -s ours

am skip reason: Change-Id I7e88c79e202f201dbb40b19ee717967675de0ba2 with SHA-1 c876a59d is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1469913

Change-Id: If692d5a19dd7ecbdd0a8b87bce1d71dee1d1c8f2