Merge "msm: board-8064: Ensure that PM8921 GPIO 23 is only used on CDP and LIQUID"