Merge "Merge "Add network disabled reason starting index" into oc-dev am: c7642c3239" into oc-dev-plus-aosp
am: 6ea58fad63

Change-Id: I00af68bba1c5f6bd4a5abb60b7cce0527a8746d3