Patch visibility to stay limited and reviewed am: f359d312b9 am: 671773e8d4 am: 7567a2e602

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

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