[automerger skipped] Merge "Remove android.telephony.action.NETWORK_SET_TIME" am: 99d116cbbb am: ed18df1b5e am: 875ad7f24c -s ours
am skip reason: Change-Id Ifa64d0dfa82a2db7742c0b3fcc76ad73b231a9f9 with SHA-1 ad7694357d is in history

Change-Id: Ia26b5f25692fb698c0cb46484567e87416ad581b