[automerger skipped] Adapt change clearkey to Lazy hal am: 997812b9 -s ours am: 1c5156a8 -s ours

am skip reason: skipped by user robertchou

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

Change-Id: Ie1304b1a30b3c491c46065997fae83cf1c855904