Merge "AIDL vibrator required for launching devices." am: fe720b1bf3 am: f33436fdaf

Change-Id: Ia2f7516d6a0fb2fc85584668da9e2521a15257bb