Merge "Update Accessbility vibration settings." into pi-dev
am: 204dcfdb4c

Change-Id: I946902304191ca136cdb960683cdf742cb8ff9a3