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

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

Change-Id: Iecf4afea95c1a3073bd277db79cb0fb7df87806c