Merge "Modify incorrect output format in log" am: eefb5dba6f am: cda700032e am: aa50f84445 am: fd18395809

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

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