Merge "Make android_certificate_directory public" am: 42bc8b98 am: f2188a79

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



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