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

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

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