Merge "Expose ServiceState#getDataNetworkType as SystemApi" am: 38fa60b5 am: 370a9340 am: e3faa5f0 Change-Id: I7cb7081d62ca6be991bcc85ddc357594ab50b2ae