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