[automerger skipped] Merge "Add format value for NULL offload info" into...

[automerger skipped] Merge "Add format value for NULL offload info" into tm-dev am: de6277bc am: f39d1d2c -s ours

am skip reason: Merged-In I077673aaa4d7f60dd1de280b5eab3ae4a6a45809 with SHA-1 b3ec8aaf is already in history

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



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