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

Change-Id: Ia7c2ed8bd68fa45652543037d810740767e2a6d6