Merge "TextView longpress 2 haptic feedback fix" into oc-mr1-dev am: 04b6095082
am: ddb8ced959

Change-Id: Id1ebf69c0f3c94f5c505c2bbe2f2dc52cb342fbf