Merge "SurfaceFlinger: define LOG_NDEBUG for debug." into main am: 88044abd0c am: e44baccfc5

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

Change-Id: I488578c22688cfe4a2503ca822ba8b7c65f7fcef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>