[automerger skipped] Merge "Rename max.active.modems to active_modems.max_count" into rvc-dev am: 2dfc9f85 am: 0c1ee8fd am: ff5caf2c -s ours
am skip reason: Change-Id Ie1ce63782994db8092128f81d10040e1a2d684ea with SHA-1 412a6b5f is in history
Change-Id: If8069044d83ba906d67a112d8af51d847e847d3b