Merge "Frameworks: Fix idle-background-job flag" am: 3a16db62ec am: 83419c750f
am: 64f4a15a87

Change-Id: I657a946fd67a44697a51df4b43a60de0cc69c8be