Merge "Dynamically enable/disable watch for RAT type changes" am: 3fdad73a32 am: cc1d6b13d6 am: c98228cf54

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

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