tree da5ab76abd9bb3d988a4041568fb3f88c9f479d2
parent 1f5211ff5122d765f7d0c286627b1a8db92cf206
parent a42b6bffbbd0f7da7ebf06dd4059269dc01b4c96
author Les Lee <lesl@google.com> 1636162215 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1636162215 +0000

Merge "Fix normalize doesn't work on carrier template" am: a1e47b652b am: a42b6bffbb

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

Change-Id: Icc28a06c508147e089f1f43e5cb163921fa96be4