tree 6ce56c0362ec56c57f6096837b5af161ae808798
parent 429a15d48068fa0fc95040c3fd7ec499fb1a67cf
parent c155bb62a167356cc089481ff8314ae78432fea6
author Hall Liu <hallliu@google.com> 1603408840 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1603408840 +0000

Merge changes from topic "mainline-telecom-constants" am: c155bb62a1

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

Change-Id: I5da60e9f18ee80293baf2b0a1a5734d72b20f907