Do not remove ntp by default.

If both ntp and chrony are installed, disable
ntp.

Bug: 1002928
Change-Id: I47219858731327df2ef349ebb09de79902739f58
Merge "Do not remove ntp by default." into develop