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