Merge "Remove wait_for_keymaster and all references" am: a236ff87b9 am: f267642932

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1736579

Change-Id: If6bbdf4c3ae08f8d372afbd635353b47c131fbdd