Merge "[Service] Cleanup CHRE 24Q3 flags" into main