Merge "Fix IndexOutOfRange in dumpsys content." into oc-dev
am: 28afa23a8f

Change-Id: I4c3561c8496a3892ca7a0ea425b979298b20acde