Merge "Make service start whitelisting for background activity starts persist...
Merge "Make service start whitelisting for background activity starts persist after service start." into qt-dev am: 7b0194c4
am: 5545ab1c
Change-Id: I1b305920ed2fe96124487527c844a23315c81f97