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

Change-Id: I7cb7081d62ca6be991bcc85ddc357594ab50b2ae