[automerger skipped] Merge UP1A.230905.019 am: 0ea3181c68 -s ours am: 6fb6425739 -s ours am: aeeeaa2cfc -s ours

am skip reason: Merged-In I8981f42c3b0b8ba9e5246c0aaedaafc5d7bfe71a with SHA-1 298ba980a2 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/24625328

Change-Id: I563eed0f0ebf63b7947e057311be428aff588f43
Signed-off-by: Automerger Merge Worker <[email protected]>