[automerger skipped] Merge "Unexpose getDataRoamingFromRegistration API" am: c9252b35 am: f7741924 -s ours
am skip reason: Change-Id I695645418d2babc1eb524a29b2054c1cd8f74da3 with SHA-1 ba01f23e is in history
Change-Id: Ia813135ea3d9a21558114291d80a454a2245b22f