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

Change-Id: I68af684fa3f8be2cc8d9518eee5bd9dbc1b118cb