Merge "Check against SDK now that it's updated" into sc-dev am: 0a9a50dcec am: c510cd05e7 am: a3e8fdecfa

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

Change-Id: Id309824805b9d046f91ab6e99059612cad68ae3a