[automerger skipped] Merge "Remove mini-keyctl usage from UpdatableSystemFontTest" into main am: 836300c333 am: 3930d9a368 -s ours

am skip reason: Merged-In Ib4a32a9bbb27ebd2e9a32dc308f79ec1c91332ce with SHA-1 d5e936166b is already in history

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

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