Snap for 8649577 from e862bdd306aea9d8a3fafe36658946e8bd388503 to tm-release am: b846af8c3b

Original change: https://googleplex-android-review.googlesource.com/c/device/sample/+/18624852

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