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

Change-Id: I001ddbd12794ce1cb09826cf07c7d1993adf5c65