VOL-789 If enable on activating device, go back to waiting for activation
VOL-789 If enable on activating device, go back to waiting for activation

Change-Id: Iaff40006ff4e7e9b2f690230ca2d69c8eaedf6e0

opencord/voltha,opencord/voltha,opencord/voltha,opencord/voltha,opencord/voltha