Remove unneeded && statement by lifting some logic into other cond.
Remove unneeded && statement by lifting some logic into other cond.

dimagi/commcare-android,dimagi/commcare-android,dimagi/commcare-android,dimagi/commcare-android,dimagi/commcare-android,dimagi/commcare-android