[automerger skipped] Merge Android U (ab/10368041) am: 7317e9aed2 -s ours am: 832fbe87e2 -s ours am: 29f6a8d4cb -s ours

am skip reason: Merged-In If240d22844ce47df705295965261537d13bb4654 with SHA-1 07e40c436f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/jsr330/+/24182198

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