Merge "Fix DominatorTree for locale and mcc/mnc config" am: 8f2f4e14de am: caff40cad3 am: c9acec6545

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

Change-Id: I680147cd3a77d96d09c13a2f802bd8e4e7124669