Merge "Merge "Fix IndexOutOfRange in dumpsys content." into oc-dev am: 28afa23a8f am: 4710a7ad03" into oc-dr1-dev-plus-aosp
am: 27e5b1676b

Change-Id: I9bc71d1f9de44f2b59e6f4f2f4490fdf5c600d09