Merge "Migrate existing jarjar plugin users to shadow plugin" into androidx-master-dev am: ff7165c14a am: 82570b9973

Original change: https://android-review.googlesource.com/c/platform/external/icing/+/1499180

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I52a0f5239924e9d2389cebc47508c00988713554