Snap for 8693000 from df142880e86418dad6b40fddb001ebd897919595 to tm-release am: d57169e64c

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

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