DO NOT MERGE - Merge ab/7272582 am: 768892d940

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

Change-Id: Ifa0fcb67a4a57454109722f914d00539be1cfab5