Merge "Rename EXTRA_NUM_OF_ACTIVE_SIM_SUPPORTED." into rvc-dev