[automerger skipped] Merge "[PM] Compile libs for both archs" into main am: e15ab5e20c am: f41ab02de5 -s ours

am skip reason: Merged-In I2b7582b30102c03de8173a17ca5b0851c4fb73c5 with SHA-1 590c3cf45d is already in history

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

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