[automerger skipped] Merge "[DO NOT MERGE] Fix Heap use after free in clearkey...

[automerger skipped] Merge "[DO NOT MERGE] Fix Heap use after free in clearkey getSecureStops" into qt-qpr1-dev am: 40ac2f6b -s ours am: 06675ff3 -s ours am: 315bc413 -s ours am: 346b984e -s ours am: 622c2423 -s ours

am skip reason: subject contains skip directive

Change-Id: Ia74b06512dd050c670256eed99700434c509e487