Merge "WFC roaming mode setting can not be used with a fixed value"
am: 7296b6cb1c

Change-Id: I0b4bd383fe9ac1e057e652664fc3fb0a250f1eeb