Merge "Vibrate when ringer changes to vibrate" into pi-dev am: 730b9bd497
am: 506f37ae34

Change-Id: I91ee6bad6c21c1757e340f76c4ac5f9d56f5b6ac