[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" am: f4a8f1f2 am: d9cea319 -s ours am: fb573b8b -s ours am: 212f2c21 -s ours am: b5b8614d -s ours

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

Change-Id: I60293d6c82bad51cd37c3a50449cb30dbd101e4f