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

Change-Id: Ida91bfe0fef7ec594a1a953ada969e34440ad868