Merge "Make service start whitelisting for background activity starts persist after service start." into qt-dev
am: 7b0194c461

Change-Id: I79f053410254d6571c6b9e7278ae5f65a947f1a5