[automerger skipped] Migrate SettingsIntelligence to androidx. am: 5fa5bed1af  -s ours am: ce9b7b416b  -s ours
am: 4c0c74139f  -s ours

Change-Id: I561eb43434ba7917c18f23f7a27516ce0ada93a5