[automerger skipped] Merge "Merge "Create new WifiEntryPreference if WifiEntry object changes" into rvc-dev am: 6d93851386
am: 6c0e4e9e48
am: 3ba8caae95" into rvc-qpr-dev-plus-aosp am: 70067d5c8c
-s ours
am skip reason: Change-Id I48ac11364b06887cc4059bcda863b456e206c9bd with SHA-1 2547d0617c
is in history
Change-Id: I0b564d39a317101b3e0e157e4bfab4f74cdf1634
This commit is contained in: