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

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

Change-Id: I24c543eeffdbe6f57bc49a179c8a97d875a69d46