Use correct suppression calculation for suppressing ambient display

Currently, the passed in suppression rather than the aggregate is
being used to determine whether AOD should be suppressed. This
changelist changes this to the proper calculated suppression.

Fixes: 422209948
Flag: EXEMPT bugfix
Test: atest GtsDozeDeviceTestCases:com.google.android.doze.gts.SuppressAmbientDisplayTest#suppressAmbientDisplay_falseWhileAnotherTokenActive_afterScreenOff_shouldNotEnterDoze
Change-Id: I3f679c089d7f50e80f8787a7668533f0cc132376