Merge "Always include BAND_MODE=AUTOMATIC in the Radio Band Mode List" am: c98ca3da26 am: 9b0c6a525d
am: f44fd8d98d

Change-Id: I6845ff460b0b2d7c1960568b920685673dcba6fc