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: Ie26953aae751be9f834da654b620ab9213c6a964