Merge "Log wtf for warn-on-blocking on eng builds" am: 66e5f1dac2 am: 5f154f25fe am: 704774269a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2285778

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