tree 47909b7e82a31bd21ed063bfbdc8775eab926d46
parent b7e00ee8dec3feeb93daa0c961b616c6874f2071
parent f735cc38b0d027cfd4bd2282f16d6edb6a9d2e88
author Les Lee <lesl@google.com> 1636164483 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1636164483 +0000

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

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

Change-Id: Ibb25859b34532cc07f9b11cbc106a8b4acc3b8f9