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

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

Change-Id: I1636310c167edb1ce3c8935af6ae52733f3887c4