Merge changes from topic "tc_change_23050307_55" into udc-dev-plus-aosp am: 5a4e106565 am: 5316ed0315

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

Change-Id: I68df7e9c40a981b0e428ee62161b72519660e6c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>