Merge "Replace error_occurred with skipped" into main am: 8ee1950c am:...

Merge "Replace error_occurred with skipped" into main am: 8ee1950c am: 86113585 am: 133f139b am: 167db9d4 am: 189ef939

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



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