Merge "Add @hide to the keymaster interfaces" am: 1497fc86e0 am: 568794ad09

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2277929

Change-Id: Id83e443b60c05c829b2d3cf263e750e26c105833
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>