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

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

Change-Id: I14fabbacebafd7c8f645049b58514e2e5189d4e5