DO NOT MERGE Snap to latest SettingsIntelligence source

Bug: 67755462
Test: rebuild
Change-Id: Ib606a68c10f83c3a1479f234af19fe840b3120d0
95 files changed