Track active user inside keystore service
am: 78daac2ca8

Change-Id: If2060d08c529bdbc4fedf08cb0c338339c1fea2d