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