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

Change-Id: I3ac95a44a1d61a932bb4f6c420944291aa1a1bce