Snap for 8408164 from 1f83bd3f4e0fdd6fc4dbe7a41f0052ae29598bf6 to tm-release am: 004dd384b1

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

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