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

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

Change-Id: Ib2c6beaf4782b2014c65914647270af7d660e2cf