Merge changes from topic "revert_uce_dupe_req" into tm-mainline-prod am: 9dfd9065

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

Change-Id: Idfd46984bd9c9a14a127ce09ca226113664ee9fb