Merge "Add tracing tags to vibrator" am: c415d00fbe
am: 0f71d5fe53

Change-Id: Ifdaba4c1a0cf4eef02b4cd611ecab9668dbf2f6b