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

Change-Id: I5a76e4985eb37c6c564126ad68148ccd29bceef8