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

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

Change-Id: Ibc33cc8a1562ea634e27d39a14601539fb433e84