Merge changes from topic "secclock_sharedkey" am: 600b7775ef

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8649655645d0eebee53ea16061c55193c9ec3843