Merge "Use Option.ofNullable instead of Optional.of" am: a85c99c791 am: b4542cff95 am: cc470bc084 am: 42496f8036 am: 4b4b96883c

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Dialer/+/1792941

Change-Id: I329ba03fbc82da4c153a60024be8499106c371f8