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

Change-Id: Ic3a2fe21fa47b7b33acea23f1e1f5b12fb14f18d