Merge "Initialize serviceCache before first use" into main am: 1e2aa90e38 am: 1d6f303816

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

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