Merge "Only allow dynamic override for eng and userdebug builds" into main

import android.annotation.Nullable;

import android.app.ActivityThread;

import android.content.Context;

import android.os.Build;

import android.os.SystemProperties;

import android.util.ArrayMap;

import android.util.Log;

    private static boolean checkIfFlagShouldBeOverridden(@Nullable String flagName,

            boolean defaultValue) {

        if (!Build.IS_ENG && !Build.IS_USERDEBUG) {

            return defaultValue;

        }

        if (!Flags.showDesktopExperienceDevOption() || enableDisplayContentModeManagement()) {

            return false;

        }