Merge "Modify incorrect comment information" am: 4442ac30 am: 51ea096b am:...

Merge "Modify incorrect comment information" am: 4442ac30 am: 51ea096b am: 1b33494b am: 87d93ba6

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



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