Merge "Fix description of indices for messages in the ICC." am: 1a1dcba955 am: 803802e7c1

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

Change-Id: Icf4bfe7e86bc94329ebaeb713831e858b6a48c68