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

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

Change-Id: I949b59d7ab93ab4ffd7f58da6fb96119a52a96b1