Merge "Avoid hardcoded paths to specific APEX jars in the fd allow list." am: 3e2cfa7b3d am: f49b8a3b05

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

Change-Id: I816ef0a1a079be14b7c27bb36ef894904b06805b