Merge "Add some debugs to diagnose test failure." into tm-dev am: 9d8609fb am: 6c63dbea

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

Change-Id: I1290c3c5b482063cd291935c3c9f1174bbd975f6