[automerger skipped] Merge "Jarjar other static libs from entitlement" into tm-mainline-prod am: 994f45a0fc -s ours

am skip reason: Merged-In I69476a76784fd35f5680b3ef3c726e4920cd560e with SHA-1 c6c722f919 is already in history

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

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