[automerger skipped] Merge "GraphicsTracker: handle dequeueBuffer error while switching Surfaces" into main am: 677708a2ce am: 38d215bb37 -s ours

am skip reason: Merged-In I66058eab90d14418830fdbbbf3b6319bf585072f with SHA-1 1dc00b0a29 is already in history

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

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