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

Merge "[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" into rvc-d1-dev-plus-aosp am: 15d31594 -s ours am: 23bb9ad9 -s ours

am skip reason: subject contains skip directive

Change-Id: Iff1f8a2ef8f184f5177b71cdc12268d25680b924