More multi-user fixes on SampleClusterService

Bug: 79884417
Test: Ran on device
Change-Id: Idedb6d708c99a7e170b3310e39954329dd8b5085
8 files changed