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

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

Change-Id: Icc28a06c508147e089f1f43e5cb163921fa96be4