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

Change-Id: I81ccdc0910ab5298d5b54f3b8e390262d02225ea