Merge "Replace error_occurred with skipped" into main am: 8ee1950cf5

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

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