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

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

Change-Id: I086c3adae4a929bd3dd06da6c258b3bcb12ec9bf