Merge "Update CharacterEncodingDetector.cpp to remove TRUE/FALSE macro usage due to ICU 68"