Merge "Correct spelling error." am: 552744d4 am: cf4ee67f am: 76800796...

Merge "Correct spelling error." am: 552744d4 am: cf4ee67f am: 76800796 am: 613f33b0 am: b1e86071 am: a15d2abb

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



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