msm: mdss: Support Assertive Display merged mode

Add support for merged mode in Assertive Display to be used when MDSS is
configured in dual pipe mode. Add specification of slave hw for clarity.

Change-Id: Ia3f15c36ab79120867f9cf186414783e15e53191
Signed-off-by: Carl Vanderlip <carlv@codeaurora.org>