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

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

Change-Id: I4d1c78c6e3de0e0778996548196d2f20756c8ae3