Merge "vibrator: Deduplicate Supported Primitives Check" am: a399d331fb am: 56438136f7

Change-Id: I23854bf3705189d3c0eb48fd8b722dc55d6327ed