[automerger skipped] Empty Merge Android U (ab/10368041) am: a55e6c0991 -s ours am: b9fc8f70c1 -s ours

am skip reason: Merged-In I8a9557218db684ac558f242e3daa2b19b7c45e15 with SHA-1 1be9601f7c is already in history

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

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