[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: 8680e98c -s ours
am skip reason: Change-Id I704bde1d3ca525e5325aaa89c89fba67f2bef66c with SHA-1 1eb1e0f1 is in history
Change-Id: Ic1d6dee285cb26ec63abaf3841bf6d1ee38001d7