Merge "Merge "Fix IndexOutOfRange in dumpsys content." into oc-dev am: 28afa23a am: 4710a7ad" into oc-dr1-dev-plus-aosp