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