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

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

Change-Id: I201b6fd062f10dff59ca96f0ac0106a249f9aedc