Merge "Fix NPE in MceStateMachine when getState() is called during shut down"
am: 866998cac4

Change-Id: If667144a6994f5968f1e531fab90c064f779784d