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

Change-Id: I78676a68b624813870bd100577969dbbea66b635