Merge "Only use concscrypt certs if directory is nonempty" am: cefc5a13e9

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

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