Merge "Rename RadioNetworkConstants to NetworkConstants." am: 289b3fbca8 am: 4d2ffac581
am: c84d79740e

Change-Id: I2998277c63caa244aba07372ac8104aeeed85529