Merge "Move permissions allowlist for ExtServices" am: 10d6466dee am: 8ed8b87214

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

Change-Id: I030e224beb54d103badb7651dd809d26da49d6db