[automerger skipped] ASM - Use finishing instead of isState() and more logging...

[automerger skipped] ASM - Use finishing instead of isState() and more logging am: edb6afca am: e8fda039 -s ours

am skip reason: Merged-In Ifd72b9b9762a654e5581c3861115420c4a02a4c6 with SHA-1 6c60d0ba is already in history

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



Change-Id: If23efa80345ab316af3b94cc01ced8a7d26db20d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>