tree f6e982cbba317ec9a9afd696f00abab4864c95a9
parent 2eabc68a4f01d99b4eca2e3227f55e42c6f805ae
parent f5a037d685a5aac48462273de9b0dff5c45d051a
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1578541521 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1578541521 +0000

Merge "(Backport) Pipe through featureId from caller to permission checks in telephony code" am: 0104ce5293 am: f5a037d685

Change-Id: I09813d60dacabbd98e395816f9d7cb6d965a4f19