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

Change-Id: Ia2c5c15aa5a029a4b9d5064e0a97bc086f7187cf