Merge "Remove wait_for_keymaster and all references" am: 62c5682bbc

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/1737276

Change-Id: I1e4360761147534a02b35eb8047f6c5f620aab2f