roomservice: fix derp breaking initial device sync

Change-Id: Iab4d40d2365d90a8070d5ca09776bfec0acc3eda
Merge branch 'kitkat' of github.com:AOSPA-legacy/android_build into kk4.4