Fixes for errorprone update am: 770eda9f64 am: cc1ee0ecb2

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/3286281

Change-Id: Ief2542a93ce21761041cc9cfe61955deb8a9e2a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/src/java/com/android/ims/rcs/uce/request/UceRequestManager.java b/src/java/com/android/ims/rcs/uce/request/UceRequestManager.java
index 8955ec4..56a9ae7 100644
--- a/src/java/com/android/ims/rcs/uce/request/UceRequestManager.java
+++ b/src/java/com/android/ims/rcs/uce/request/UceRequestManager.java
@@ -952,7 +952,7 @@
             SomeArgs args = (SomeArgs) msg.obj;
             final Long coordinatorId = (Long) args.arg1;
             final Long taskId = (Long) Optional.ofNullable(args.arg2).orElse(-1L);
-            final Integer requestEvent = Optional.ofNullable(args.argi1).orElse(-1);
+            final int requestEvent = args.argi1;
             args.recycle();
 
             requestManager.logd("handleMessage: " + EVENT_DESCRIPTION.get(msg.what)