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

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

Change-Id: I8102fdf54c026e8ff723e34ef74e728c8a31e0fd