Merge changes from topic "identity-add-presubmit" am: 6eda4846ec

Original change: https://android-review.googlesource.com/c/platform/system/security/+/1650430

Change-Id: Idb363d3ebb30057c32f7eb8815a44c83c851e0b2