Merge "Allow operator/manufacturer setting to use priority" am: aef1a557aa am: 4244d53c3e am: 0be36ac0d1
am: 80ac3f0a4b

Change-Id: I5bc6a440d7a906caed9cdfe63464f692e7f0ecef