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

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

Change-Id: If1fa51158bfa1dd5fa901d907aea72a6c8379ddc