Merge "Move generatePreferenceKey to AccessPointPreference." into oc-dr1-dev am: 635575d579
am: b7c4518d57

Change-Id: I7da1349402f57d94f450a0d1d4e85864a1fafb5d