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

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

Change-Id: I6b6b6bf2ecb367f81fdb82321c7e7bb3cd8a228a