Merge \"Not dynamically add system-background tasks to bg_schedboost_fd.\" into nyc-mr1-dev
am: 08d097adb4

Change-Id: I54a0332ad0bb61c3db5dbc5fc8a5be2558f356d6