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

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

Change-Id: I78ffd81962fdfba38c46590e8b6ae76c582ab77b