Merge "Fix for CTS testAllowWhileIdleJobInTempwhitelist" into pie-gsi