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

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

Change-Id: Id0f9b0a9ae09df362aa49121d168ad5d31f857ec