[automerger skipped] Merge "Fix for CTS testAllowWhileIdleJobInTempwhitelist" am: 23b144eb40 am: 0e3645d84b
am: fc8a7159e0 -s ours
am skip reason: SHA1 fc8a7159e0 skipped by user robertchou

Change-Id: I7c91d97e83a8e087b78570ac30b578fd778779fb