Merge "Add mainline dev certificate dir to config" am: 22907b77

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



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