Merge "[SM10] Adopt helper class to monitor RAT type change per sub" am: f4a8f1f21e

Change-Id: Ifadf4ad62820c6cbf536a3984b1cf4a0b78cbc31