Snap for 8485504 from 0015994411735b81575ad76333ac19f3b136aedb to tm-release am: 6b7ca9a428 Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/security/+/17893778 Change-Id: I57a6965c31268da82cb7e52f9884bb1a526adfe9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>