Merge "Move ACTION_NETWORK_SET_TIME to android.telephony intents"
am: dbd95a446e

Change-Id: I9e4141b40587f22e26f9e9e255317b5a10f08b04