[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: edd5229b am: b3e4446e am: 263b2946 -s ours

am skip reason: Change-Id I45c3aa9046b316c8cd0943543d620a22e4afefd1 with SHA-1 219faff0 is in history

Change-Id: I019d6fa102815a24711aea617a51aca2364b6a6d