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

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

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

Change-Id: Ie58f9f537601c60760f21b28e1c7e94dea277cc9
This commit is contained in:
Les Lee
2021-11-16 00:52:16 +00:00
committed by Automerger Merge Worker

Diff Content Not Available