[automerger skipped] Merge "Create new WifiEntryPreference if WifiEntry object changes" into rvc-dev am: 6d93851386 am: eb1f444fb1 am: 0c009aab13 am: 498c52c1ca -s ours am: 405768ace6 -s ours
am skip reason: Change-Id I48ac11364b06887cc4059bcda863b456e206c9bd with SHA-1 2547d0617c is in history
Change-Id: I2410512f1d4b6e009b3d1c8d4a1141cccbd23f3a
This commit is contained in: