Merge "Make RescueParty call vold directly" into qt-dev am: 2618371aa5
am: 810274ed2d

Change-Id: Ibe6be230b5417cec8428516f6edbead1b0146976