Merge "Fix SDK guard" into sc-dev am: e3403325a9 am: f21fee923f

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

Change-Id: Ie05e3e43a2f8db15c88df233e6d92f5344de6a03