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: Ic781df84b00623f2ed8cac1bd990fa42942e54ba