Merge "Add unit test for ActivityStackSupervisor#testApplySleepTokensLocked." into pi-dev