Merge "Update CharacterEncodingDetector.cpp to remove TRUE/FALSE macro usage due to ICU 68" am: 4886c4942c am: d2bceb08ef

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1554498

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4557f966369c659b23e689ffb456bc971af8520e