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

Change-Id: I093dcaa95180a22d05f91af645e82f588f09864b