Merge "(ImsMedia) Modify AmrMode/EvsMode to use bitmask" into main-ims-dev