Merge "Fix CtsVerifier/DeviceSuspendTestActivity Wakelock Leaks"