Merge "Merge "Don't block activity starts in permissive mode." into qt-dev am: fe0bfe66 am: 422ef892" into qt-r1-dev-plus-aosp