Merge "Configuration for priority/auto-connection for PAN." am: ba63f32ed5 am: 50cc13cc18 am: 9e33f453a3
am: 502e3e53ec

Change-Id: I8211babdceb7228c74232c15dfbc51d9f771d674