Merge "Always include BAND_MODE=AUTOMATIC in the Radio Band Mode List" into nyc-mr2-dev am: 94dee56f8d
am: 4bf8e85005

Change-Id: I5ab9d8f8808e2a35da59b330271a081a0102eec7