Merge "Fixes broken build on crosshatch-userdebug when enable LOG_NDEBUG" am: 6096e1412a am: 8a4ebe5168 am: 1db3b4cbd9 am: c7a0f59376

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

Change-Id: Id8c996ee390705e7b22c45fa016a169c2e9a230f