[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: b7e27a65 am: 868e435f" into rvc-qpr-dev-plus-aosp am: 1821fcf0 -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: I0dd7e21e1f76382fa7ea33f41c2c3fee214f4a1f