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

Change-Id: I6fd0ffa486f1ee5fac117009fa0bd7a7fb5b2a5c