[automerger skipped] Merge "[SM10] Adopt helper class to monitor RAT type...

[automerger skipped] Merge "[SM10] Adopt helper class to monitor RAT type change per sub" into rvc-dev am: cdd7c94e am: 5f800403 am: 42041c45 -s ours am: ae24c1b5 -s ours

am skip reason: Change-Id I45c3aa9046b316c8cd0943543d620a22e4afefd1 with SHA-1 95a6a3d8 is in history

Change-Id: I65040c118cde06339e9b221c557b314d205aa60e