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

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

Change-Id: Iedf0fcdd24fa9ec3ff5ebb3124f9fd12acbbfeec