Snap for 8704672 from a156ce85ab8192925dba099f507826d9c350bdc0 to tm-release am: 321125a8a8

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/gchips/+/18823301

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