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

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

Change-Id: Ice79c30eeb522ff47191feb8d4f1f20c57a6d995