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

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

Change-Id: Id5e2c4778c383cd3bee69cdcc059a94590f39ff6