[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: 768892d940 am: 99ae46cd26 am: d668b38422 -s ours am: b13a6d7055 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I93e2e2b75552605c05499e31e5d6d8f22b80ec21