[automerger skipped] Bug:PreferredNetworkModePreferenceController.java not being refreshed am: b5dcd35969 am: b29e64ace1 -s ours
am skip reason: Change-Id Ib5cc06cdbfd2fa70cd115d70337b21500e362da6 with SHA-1 7164275393 is in history

Change-Id: I71905b759fcd47d4cab1f24dc6cf989d97ceab8a