Merge "credstore: update credstore.rc to use correct class, user, and group." am: 662e346347 am: b781cc2399

Change-Id: I08d7c9271a59e734f93e8f22eb302d3fddcb2c4f