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

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

Change-Id: Iba51301fd82c54d333b870107d4c5b6acdcc1752