Merge "Fixes broken build on crosshatch-userdebug when enable LOG_NDEBUG" am: 6096e1412a

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

Change-Id: I919b932e54b929ed2225f27ec11919211a066687