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

Change-Id: Id4b104e811a30722ea3c70add3750a9319245ff5