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

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

Change-Id: I4635d743f9a6672904aaf91fbdc1cbf8fb8ad21f