Fix: 390135885 Flag: com.android.settings.flags.catalyst Test: manual Change-Id: I0a8edbc6fa2a13d653a85ddfe36bd551e09796f8