Merge "Edit METADATA file" am: 35c661d88b am: 556ad10048

Original change: https://android-review.googlesource.com/c/platform/external/objenesis/+/2645293

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