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

Change-Id: I2f962bc6b2c2c8eda54ed8d9578922bd67e441dc