[automerger skipped] Merge "Uncomment logic for RAT change and add NR...
[automerger skipped] Merge "Uncomment logic for RAT change and add NR State/Frequency" am: f18b86a5 am: eddd6da6 am: 36499305 -s ours
am skip reason: Change-Id I48d2bb9ad102b2866bbced56e2e4dc82a9476834 with SHA-1 7a18b427 is in history
Change-Id: I6603e7903834144fb3df2c33dbf4eaf94e0c902f