Merge "Add per-device defaults for VIBRATE_WHEN_RINGING" into pi-dev am: eb2fdbb3c9
am: 6489d832e1

Change-Id: I3e54ce6ecb394ff591d25f31560a05b84acd8141