Merge changes from topic "secclock_sharedkey" am: 600b7775ef am: ec6228e4d5

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I34e4e15b5bb51af20aeb2b351886ad55808f4cdc