Merge "suppress end-of-process destruction of several static variables" into...

Merge "suppress end-of-process destruction of several static variables" into tm-qpr-dev am: 65dae2bc

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



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