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 am: 11c7582b

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



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