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

Change-Id: I3955e664efbf87f2d78f5f2f7cf95916fa9026cb