Merge "Merge "fix dead loop issue when run android.appsecurity.cts.PermissionsHostTest" into nougat-mr1-cts-dev am: e2e4001cb2"