[automerger skipped] Merge "Re-expose raw data roaming state" am: efa17d98 am: a48f3837 -s ours
am skip reason: Change-Id Ibe52c06a4a42bce0f83548355907459a5b152d9a with SHA-1 d4b4da2b is in history
Change-Id: I46466a3bc7b8a0b0723e596eb1031c5d80215adc