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

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

Change-Id: I2e10b617dc3073b726ffc455a305a64bc73bc178