[automerger skipped] Merge "Create different KeyId for saved and suggestion network" into qt-dev am: 2d62d5b7ec -s ours am: ccf5b5d652 -s ours

am skip reason: Change-Id Ia416b2e986c86fe0a29641f6a20236802d72a233 with SHA-1 96a9e48520 is in history

Change-Id: I35a2fc19fc71f746bc9738d851aa1db24bfa04b2