Merge "Use nullable field and boolean rather than optional" into sc-dev am: 048a858575 am: c857d45d97

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

Change-Id: Ifa4e8f09e5c088da79514db8c789226010d2b019