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

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

Change-Id: I1ea34e82df2893e31de97ba1267aa52a7dda91b0