[automerger skipped] Merge "Update enabledModemBitmap metrics" am: 2987a94af3 am: 7b1a3b7e14
am: 79ab2ff20d -s ours
am skip reason: change_id If27dba3a7676fbe25d15f70ab48c5572e7606872 with SHA1 6c2dc9fe56 is in history

Change-Id: I624ab65570d153d88d8bb6a2a976087c4b423af4