[automerger skipped] Merge "Add service-entitlement to the Jarjar rule" into tm-mainline-prod am: 5b37ec3168 -s ours

am skip reason: Merged-In I236ff68dbada65bab32c7372abe534637581bc25 with SHA-1 15eca4f51b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Wifi/+/21779046

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