Merge "Flip flag to enable vibration on wireless charging" into pi-dev
am: 65477d138d

Change-Id: Ieb817348628c020578ea7c8c7205b6e9f412e2ed