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

Merge "Fix normalize doesn't work on carrier template" am: a1e47b65 am: a42b6bff am: 10f7bb62 am: 05406865 am: f735cc38

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

Change-Id: Ibb25859b34532cc07f9b11cbc106a8b4acc3b8f9