msm: gdsc: Correct ordering of logic and memory collapse

To avoid leaking current from the MX rail, FORCE_MEM_PERIPH
should not be set unless the corresponding GDSC is enabled.
Update the order of operations to ensure this is requirement
is respected.

Change-Id: I257c5b17392579fca4a765d0facdd97a8a526ac5
Signed-off-by: Matt Wagantall <mattw@codeaurora.org>