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

Change-Id: I03328a35f8b3306ab71cc2f313dc1ae222c70aa0