Merge "Merge "NativeCryptoInfo: fix ctor invocation" into main am: 1f108e02...

Merge "Merge "NativeCryptoInfo: fix ctor invocation" into main am: 1f108e02 am: 7c4ae57f" into udc-dev-plus-aosp am: 3e4cb765

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



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