Merge "Add CachedService Class" into main am: ac1af41d42 am: 0c86981698

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

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