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

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

Change-Id: I6c478d9da1ddf1d9cdaf1a935d16b9b1892aeee3