Merge "hwc: Handle validateAndSet failures in AD prepare call"