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

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

Change-Id: Id0b084d4aae3dcb72203147f1cdeb2c98141d240