Merge "Fix for CTS testAllowWhileIdleJobInTempwhitelist" am: 23b144eb40
am: 0e3645d84b

Change-Id: Ifdba2bfe1d83d2bb3f0510c83e7dd5f89e5bce3b