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

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

Change-Id: I0023f1985526779e2423410ac740af239372aa26