Merge "vibrator vts: use CompositePrimitives enum_range" am: d895913f1b am: 8679c62cb7

Change-Id: I0ebc9c9add8bb89406fe0e9890ed688c7e8eb3f5