Merge "Add lock to update mCache from the constructor" into main am: 791687cf23

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

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