Fix SDK check T+ roles/role permissions. am: 07f8f01646 am: a7cb100f42

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/15224716

Change-Id: I005362a9d1e7e5937d659e61ad901377605f256b