Merge "Tweaking workaround to use fallback with null buffer" into rvc-dev am: 5be32a1c11 am: b7e27a6598 am: dd5ff3be0f

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

Change-Id: Ic841fbb52638fba1490a0388f97cdc5431982de6