Merge "Adapt change clearkey to Lazy hal am: 0a50473369 am: 588b4ead25" into qt-r1-dev-plus-aosp