[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 -s ours am: 1520570c -s ours am: 627b234d -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: I35941310a6ffcad59f6b537beab874fcea71f550
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>