Merge "Fix debug macro" into tm-dev am: c3f06be6 am: f6d58e4a am: 7b254530

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



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