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

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

Change-Id: I5a96774ad2104a6b03c9abab2b105b97195edea8
tree: 5c4fb6091c4dfa6166c19b6bf0a1fa52e4ff4698
  1. core/
  2. services/
  3. tests/