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

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

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