[automerger skipped] Merge "Update Accessbility vibration settings." into pi-dev am: 204dcfdb4c
am: d507ddd71c  -s ours

Change-Id: Ia7063753b264c4baa9e3cf329a432419e8d05e76