[automerger skipped] Merge "Create new WifiEntryPreference if WifiEntry object changes" into rvc-dev am: 6d93851386 am: 6c0e4e9e48 am: 99b295c285 am: 74ffadfc24 -s ours am: bea39a4949 -s ours
am skip reason: Change-Id I48ac11364b06887cc4059bcda863b456e206c9bd with SHA-1 2547d0617c is in history
Change-Id: I7b0066f5d04a704fdf07de933fb9071ca203cd87
This commit is contained in: