Merge "Enable optimizer on service-connectivity" am: b1c08a00fc

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

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