Create different KeyId for saved and suggestion network

Bug: 150500247
Test: atest android.net.wifi

Merged-In: I31ee6f3a3295aca0bd7fcb83ce74327922977797
Change-Id: Ia416b2e986c86fe0a29641f6a20236802d72a233
2 files changed