[automerger skipped] Merge "Tweaking workaround to use fallback with null...

[automerger skipped] Merge "Tweaking workaround to use fallback with null buffer" into rvc-dev am: 5be32a1c am: b7e27a65 am: dd5ff3be am: 3091225d -s ours

am skip reason: Change-Id Ia61809a4dc53317139446d099cfa262c095d2aea with SHA-1 e18aa866 is in history

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

Change-Id: I469700564ccb5835767e8f402cfcd24a62c5f277