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

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

Change-Id: I1ed0bbd53ef17081f6533cb5b6f8407aadcca2a3