Merge "Show subId info for getMessagesFromIntent log if it available only" am: 6478559721 am: 83b308025a am: 40b66a14d8

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1318274

Change-Id: I5a4a4454d4e0ee958e3b2fdab0e456f942ec5b6b