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

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

Change-Id: I62b4c1c76a5aac2c1e8b3beb42ea3d2544044dda