Merge "Merge "[SM09] Add helper class to monitor RAT type change per sub" am: 64ccb88948 am: 95a78d2994" into qt-qpr1-dev-plus-aosp