Merge "StateMachine: check for null curState in dump()" am: 2ca1abc174

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

Change-Id: Icd816d756739d16e0fdb85b8ff1a783e7ba02b67