Merge "Remove android.telephony.action.NETWORK_SET_TIME"
am: 99d116cbbb

Change-Id: I1b21098b865115904defec48c989f570800c9930