Fix: 383632913 Flag: com.android.settings.flags.catalyst Test: manual Change-Id: I9aa9544c4749e543f5a923d166e4268af595a500