[automerger skipped] Merge "Avoid hardcoded paths to specific APEX jars in the...

[automerger skipped] Merge "Avoid hardcoded paths to specific APEX jars in the fd allow list." am: 3e2cfa7b am: f49b8a3b am: ec133b58 am: d3fa59b1 -s ours

am skip reason: Change-Id I2cbe75381c3032e56dd0cd2934bda3f027cb65bf with SHA-1 b2d305c5 is in history

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

Change-Id: I8ad3ea8c08c6f7ce67f081110025c1284096a5fc