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

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



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