Also remove duplicate ic_settings_storage.xml, rename ic_settings_storage_white.xml to ic_storage_white.xml, and fix up references. Bug: 77982107 Test: manual Change-Id: Icd78c2a2a8d200cb8819d58887455883acdbc668
Change-Id: I10648df80566629c09d03211ed642516595e4b22 Fixes: 62548249 Test: Manual