Merge "Fixed LinearBlock thumbnail crash issue" into main am: 5d1e90cd61 am: b281428b5c

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

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