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

Change-Id: Iaba33ff48a7f91b83fc6fd90587954e63f1ab14c