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

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

Change-Id: I69131cf7a123dba6210e270d7e1644def5e4398e