[automerger skipped] Merge "Merge "Tweaking workaround to use fallback with...

[automerger skipped] Merge "Merge "Tweaking workaround to use fallback with null buffer" into rvc-dev am: 5be32a1c am: 367b00d1" into rvc-d1-dev-plus-aosp am: 53ee9b88 -s ours am: 5d1744d5 -s ours

am skip reason: Change-Id Ia61809a4dc53317139446d099cfa262c095d2aea with SHA-1 69aebfc9 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12100099

Change-Id: I556d707364f739db6f1c9c716594e3e14cf75c6c