[automerger skipped] Merge "Merge "Fix normalize doesn't work on carrier...

[automerger skipped] Merge "Merge "Fix normalize doesn't work on carrier template" into sc-qpr1-dev am: ae28e400" into sc-v2-dev am: 682db900 -s ours am: 9a0532d3 -s ours

am skip reason: Merged-In I80c9f887cf8b4714716d657da92ed273a532ce27 with SHA-1 46cc261a is already in history

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

Change-Id: Id2334f1ee0f2ca2f0148948b413d9ece939cf242