[automerger skipped] Merge "Remove disableBackgroundScheduling" am: a0685c87c8 am: c90196973d  -s ours
am: 3544145620  -s ours

Change-Id: I3fe7e186fb4fb8d1c87181a768ca2bf952c0203b