Merge "Support dynamic 64-bit media service" am: b80ffdeb am: d93e16b7 am:...

Merge "Support dynamic 64-bit media service" am: b80ffdeb am: d93e16b7 am: 4ab06a6f am: 24a17917 am: fec0bc46

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



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