Merge "Restrict background activity start by task" into qt-dev
am: 3140044c6a

Change-Id: I29c55cb2dfb4e98a93106a30fd6d47896fe6172f