Merge "Update enabledModemBitmap metrics" am: 2987a94af3
am: 7b1a3b7e14

Change-Id: Ief7090a9bb96131704f69181b09fcf14d320b065