Create different KeyId for saved and suggestion network

Bug: 150500247
Test: atest android.net.wifi
Change-Id: I31ee6f3a3295aca0bd7fcb83ce74327922977797
2 files changed