Josh Hou ef397808bf Merge "Return the correct roaming status when check isNetworkRoaming()" ...

am: 1c1461c6a2

Change-Id: I533f9311045ed13d64d60cee85641f25de3371b1

2020-01-22 16:06:00 -08:00

..

android

Merge "Return the correct roaming status when check isNetworkRoaming()"

2020-01-22 16:06:00 -08:00

com/android

Merge "Use Intent.EXTRA_REBROADCAST_ON_UNLOCK instead of hidden API"

2020-01-22 10:12:31 -08:00