Merge "Allow operator/manufacturer setting to use priority" am: aef1a557aa
am: 4244d53c3e

Change-Id: Ia6fcaa0550f2e1bb74f61d547fcd39de3b95fe90