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

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

Change-Id: I88126827d89e5660ede4a61f979568fc6aea246c