Merge "Dynamically enable/disable watch for RAT type changes" am: 2ad5b1419e

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1315574

Change-Id: Id5c4ad325779322bbf4881816235904a6d454583