Merge "Merge "Make RescueParty call vold directly" into qt-dev am: 2618371aa5 am: 810274ed2d" into qt-r1-dev-plus-aosp
am: 2afc347abf

Change-Id: I3db4dd79a91bc61d5c24b49a9c9295a61b0ccc00