Merge "Rename max.active.modems to active_modems.max_count" into rvc-dev am: 2dfc9f85fe

Change-Id: Ia3d74559cec44eca1cc03e4a7a58e6f9b65811d0