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

Change-Id: I3580b33c5bbe91c9d985a093605728b070c210e1