Merge "AOD: Add additional delayed dozeTimeTick after unpausing" into pi-dev am: d8c77c94ff
am: 67a2f7bdb3

Change-Id: I7cd1ae0e75b771078961c72ded9c64cc156bd3e1