[automerger skipped] Merge "Re-expose raw data roaming state" am: bd85becd am: e5e69277 -s ours
am skip reason: Change-Id I8fcd568bb3b75f8c5a163bbb2a2e6d702bee8a8b with SHA-1 6c97e2cd is in history
Change-Id: I269b5d5d9e81c9cac65100b1e91a62c35e57b96a