Merge "Log.wtf in mismatch + tests" am: 1cdbc7cbd1

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

Change-Id: I185410ce82ca057b6767d5ca0ff0368f046a1dff