Merge "Added RingModeTracker" into rvc-dev am: 57404b392b

Change-Id: I23b35cfef4d71de7790b636fc89ec74431ebb2b9