Merge "Don't block activity starts in permissive mode." into qt-dev
am: fe0bfe66e9

Change-Id: I44da8610b992816fb3e9ce488208ae08f4f46fd0