Merge "Clear calling identity before calling to DeviceIdleController"