Merge "Fix normalize doesn't work on carrier template" am: a1e47b652b

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

Change-Id: I955970137e916ab402c3a81a6656a22cc5c45c99