Merge "Merge "Don't block activity starts in permissive mode." into qt-dev am: fe0bfe66e9 am: 422ef89213" into qt-r1-dev-plus-aosp
am: 2fdac9f5fb

Change-Id: I603a27b5f3ae6c5949ae13fe230926d4d3e9fc6c