tree 87352818722aafb028d89943e0a806373ffdf070
parent 0afced9423901eb4d27ed4769a0bdd374cf8aeb5
parent 318bbccc3e6ac754547bb94d98adce84025513ac
author Chalard Jean <jchalard@google.com> 1616120782 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1616120782 +0000

Merge "Check for FEATURE_TELEPHONY instead of CM" am: 6df94880b3 am: 318bbccc3e

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

Change-Id: Idcb987bc2efef9fbbf947d5c7dc0630d7ad45ddc