Merge "Fix for CTS testAllowWhileIdleJobInTempwhitelist"
am: 23b144eb40

Change-Id: Ifce8f15e876694a35c0e0a31b05d8ea47c462628