Merge changes from topic "tc_change_23050307_55" into udc-dev-plus-aosp am: 5a4e1065

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



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