[automerger skipped] Merge "Remove old implementation of NitzStateMachine"...
[automerger skipped] Merge "Remove old implementation of NitzStateMachine" into rvc-dev am: cf4f62c6 am: 7cfd0bca -s ours
am skip reason: Change-Id I704bde1d3ca525e5325aaa89c89fba67f2bef66c with SHA-1 a4011139 is in history
Change-Id: I7d6a2bbe69f61b08f3e89c69a7e0598bf58768c2