[automerger skipped] Migrate SettingsIntelligence to androidx. am: fbcfc4e75e  -s ours
am: 19123b3576  -s ours

Change-Id: Ia2dd387df0c6ae209186d08b7282782b6476804e