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

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

Change-Id: I59760a55f32106ca40678c460b6c583f7f118af9