[automerger skipped] Merge "suppress end-of-process destruction of several...

[automerger skipped] Merge "suppress end-of-process destruction of several static variables" into tm-qpr-dev am: 65dae2bc am: 21a85b5b -s ours

am skip reason: Merged-In Ie38c24b46813db198d07de421db9240f3dad36a2 with SHA-1 fa822c66 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/20693150



Change-Id: I3b86518f91c758dafd5fc4d571e96296fb3f44db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>