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

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

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



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