Merge "Disable CT verification for inline certificate and user store" into...

Merge "Disable CT verification for inline certificate and user store" into main am: dd9e9d20 am: 6877bf0f

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



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