Fixes: 356151158 Test: manual Flag: android.app.modes_ui Change-Id: Ibbc54c68c4bcbf75e908d4a36ef2d8f609b5b797