[automerger skipped] Add new system API constant...
[automerger skipped] Add new system API constant DEFAULT_PREFERRED_NETWORK_MODE am: 9160670b am: 719a0a2b -s ours am: e0539726 -s ours
am skip reason: Change-Id Ia114e4546d88e294ed37b6632a1eae6a06fbf7bc with SHA-1 f0a973b5 is in history
Change-Id: Ic31c311023cfb44bcd082f65acf9f9668e5118c2