[automerger skipped] STS test for b/236688380 am: b3f712e7d0 am: 0ce56e0205 am: d6984764fc am: eee40c2e74 am: da1444136e -s ours am: 54b845d0ac -s ours am: 7232cc8119 -s ours am: 55470a25cb -s ours am: 892793f930 -s ours am: cbfa4638b7 -s ours

am skip reason: Merged-In Id1685a97749bf4d835dcc418af4f17b66ff94068 with SHA-1 54c4b45c58 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/22957519

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