Merge "Do not use hidden API SystemVibrator" am: 69c2b21bc2
am: 472ee349ff

Change-Id: I88ae721300380b7662c15db70a156a33707206c9