Merge "Fallback added for HEAVY_CLICK effect" into pi-dev
am: 0a82994f93

Change-Id: I841994d4ea8ef7ba35ac430a25c3ef317d78d8d9