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