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