[automerger skipped] Avoid useless recompile am: 7f6912c16c -s ours

am skip reason: Merged-In Idbd48594bb16065b9d9ffa7ecd40193aa61c19c6 with SHA-1 33cc23e238 is already in history

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

Change-Id: I130da7b49d25b1776de3a05a7f39a1f5d0f91e8e