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

Change-Id: I36657c303cdf6d60e3678ffe2cc161c5a221b0f1