Revert "Revert "Check both isDozing and isAodAvailable for aodVi..."

Revert submission 27773289-revert-27770576-DGMSFQBZGQ

Reason for revert: Test failure was unrelated

Reverted changes: /q/submissionid:27773289-revert-27770576-DGMSFQBZGQ

Change-Id: I1d6631945d3f604a6d7f304cb1ff4e1cec6a49d9
1 file changed