Merge "Modify AT_LEAST_S check to include SDK int" into sc-dev am: 1184a03b08 am: b33e38242f am: e2ae682815

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15002455

Change-Id: I0514d4d22c528945b71f27028ddf2fb331e4efca