Prevent reinstallation of an already in-use group key am: 480c21c678 am: cf97e390fc am: 9c3df1e8a0 am: 6aede4986d
am: fa311f0024  -s ours

Change-Id: I5a82a3df58fe951c7d8f2f0a84b9436b5c3e0931