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

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

Change-Id: Ia9ec71af4d01110bd47f558467873270ded86a06