Merge "SF: fix BufferTX counter for null buffers" into sc-dev am: 90b688e087 am: e5af068f5e

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

Change-Id: I0d0bbf57f2842b57f457969f91d9b59bf8c33401