Merge "Add more log to debug HD+ icon" am: de7ccf0691 am: 1b1f5ac8b6 am: 200d8ea088 am: 68fce192a4

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1654910

Change-Id: I705727195a0eef70fd7a688eb5fb5b804256825f