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

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

Change-Id: I3d0356a797b42e1bb9560704c455688397d03e4c