[automerger skipped] Skip ab/6749736 in stage. am: 21b4162580 -s ours am: be6f99a948 -s ours am: 0c69656e64 -s ours

am skip reason: Change-Id Idd77abe53e4cfc10cd40e3ae3d4e8724a9d9f608 with SHA-1 2e36d130d1 is in history

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

Change-Id: Ib6b075d3e0ce0063b9b88d225d4a75160837b93d