Merge "To be inline with conditional check present in 8.0,To avoid custom permission-group failures." into oreo-mr1-cts-dev
am: 58e3d2f347

Change-Id: I617707818917ef4ec4e0111f44d5b4523fb9519f