Merge "Moving CryptoInfo creation for Unencrypted samples" into main am: bc05bdbba8

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

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