Merge "Don't allow a non-owner to grant access to APP key" into main am: 2feb9a0a8f am: 845f25476f

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

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