[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: fdbd3612 -s ours am: 098b31a2 -s ours am: 198baf0e -s ours am: c1a7b081 -s ours

am skip reason: subject contains skip directive

Change-Id: Idc39ed07934706e8410ed228e2b5020662250c73