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

Change-Id: Iaff15045e39534124f4a78fa34e0319df9f111f5