Create different KeyId for saved and suggestion network Bug: 150500247 Test: atest android.net.wifi Merged-In: Ia416b2e986c86fe0a29641f6a20236802d72a233 Change-Id: Ia416b2e986c86fe0a29641f6a20236802d72a233 (cherry picked from commit 96a9e48520fc2359a3cdd6b3513bf158d6844365)