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

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

Change-Id: Ie9e895863d75dadc9c6e55e8346a8788f21e0fd9