Merge "Add missing wrapper for VHAL Wheel enum" into pi-dev am: eb98f10ae6
am: 6c8646bab3

Change-Id: Ib889797a3ed76b46f4ff963e0bf6e0f95161056a