Make key names unique.

Bug: 184053707
Test: flash the device and check logcat
Change-Id: I38d267f09b9694f171955ee6c045dcace1238962
(cherry picked from commit a51ce46a98d7c2e3e3d9763d1e0a47ac6cb0f57f)
1 file changed