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

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

Change-Id: I558a9a2995cd92fc3d7ca87b5e516a70bb1a8ba0