Merge "Add service.proto jarjar rule" am: c1edc4cadd

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2069067

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