Merge "SF: fix BufferTX counter for null buffers" into sc-dev am: 90b688e0 am: e5af068f am: 79f31011

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

Change-Id: I3790c8177915a6a27345838a4a900e110755a264