Merge "Expose ServiceState#getDataNetworkType as SystemApi"
am: 38fa60b511

Change-Id: I3880263af615171a14600383540a673d8ec4e347