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

Change-Id: I94f2d7b9234e4fb6a2bfe15171a5145f446a0233