[automerger skipped] Merge "Add LOCAL_APKCERTS_FILE support." am: fd75d8deca
am: 0e66a44a3c
-s ours am: cd5493f296
-s ours
am skip reason: Change-Id I48183bc8cbf9dcc521f791812734205ed3f28f4c with SHA-1 29714ecda6
is in history
Original change: https://android-review.googlesource.com/c/platform/build/+/1354082
Change-Id: I37b5abd72e4c1bc9291af00f3456ba8d12227186
This commit is contained in: