[automerger skipped] DO NOT MERGE Remedy CTS issues, enable DRC features for xHE-AAC am: f4aed3b367
am: 7375a4732c  -s ours

Change-Id: Iee2dc98b7ccdbd51f4ef9cc55483980c0c79b278