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: Ia06b36daaa1ca5de67041c6c5f5f6335bc0107e6