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

[automerger skipped] Merge "Fix normalize doesn't work on carrier template" into sc-qpr1-dev am: ae28e400 -s ours am: 32b80a9d -s ours

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

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

Change-Id: I9c346209879650a19f53d935d4096886f09e2cd7