Merge "Fix typo in log message" am: b5399e420a am: 36362456a3 am: 29f9048d56

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

Change-Id: I16cf61a37dfe08966ce55b0af89e12232fc6aff7