Merge "Add format value for NULL offload info" am: c0845eab am: e4a024ff...

Merge "Add format value for NULL offload info" am: c0845eab am: e4a024ff am: ac0e4f1f am: 650040ab

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



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