[automerger skipped] Merge "Add LOCAL_APKCERTS_FILE support." am: fd75d8de...

[automerger skipped] Merge "Add LOCAL_APKCERTS_FILE support." am: fd75d8de am: 0e66a44a -s ours am: cd5493f2 -s ours am: fe75c40c -s ours am: 1e803e9a -s ours

am skip reason: Change-Id I48183bc8cbf9dcc521f791812734205ed3f28f4c with SHA-1 29714ecd is in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1354082

Change-Id: Ibb90af7bd108aa64480fd2259b5f759f69ad6dc8