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

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

Change-Id: Iaf5eb7f15639201842f282e00fe512c06ee0d26e