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

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

Change-Id: I8484c3cdbe2e4a74f67f9cda72dd7f2070474499