[automerger skipped] Merge "Added extservices in apex_available for Permission...

[automerger skipped] Merge "Added extservices in apex_available for Permission flags" into main am: e9d77569 -s ours

am skip reason: Merged-In Id09876d49337ec884a7cb347720d2787f2c428be with SHA-1 bdf2ba0a is already in history

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



Change-Id: I5c11c3744318978d9bad8b3501bd38a29b43dd63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>