Merge "Using DisplayManagerFlags to decide if  NormalBrightnessController is enabled" into main