Merge "Send userId together with enroll / setFeature / getFeature method update" into qt-r1-dev am: 47593cd29b
am: d40d9887f9

Change-Id: Ieb9522aaf393b8eeb14229b7dd907ad27a98a1eb