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

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

Change-Id: I1910729c46611c62fb16b3958851707068213d8e