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

Change-Id: Ieb226d39bf3a8990c134a9e6e67f50e3c2135ed1