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