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: I051b400799ddd507f086a60d35e520ea7e45428b