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

Change-Id: I3d1079365f13400d1f23f6e61122e00c67432dd1