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

Change-Id: Ia9f769212bd5a28edf85c0c29df4b5d330a26f17