Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/24210868 Change-Id: I108394ca8b2a10d41e28024aea24017486f63815 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>