Merge "Fix for CTS testAllowWhileIdleJobInTempwhitelist"