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

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

Change-Id: I84ac89366e75e053341a9c244405abf7796b6db4