Track active user inside keystore service am: 78daac2ca8
am: f2f820c63d

Change-Id: I237f1e4a13e2f8db5b238506fa255897075d022f