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