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 skip reason: Change-Id I78b2dc2bccde238a06398b3733cea8e574ea8ee7 with SHA-1 8e407226 is in history

Change-Id: Id922b8b50410413c5011f16e116dfe21d7d2daf2