Merge "Update enabledModemBitmap metrics"
am: 2987a94af3

Change-Id: I9dd3a0188a713c31c490f29cac2b91fc2a8e1170