Simplify  ((A && B) || !A)  to  (!A || B)

Change-Id: Iae4f45f1e64effa1369e9aba13b6b972a5ba76a0