Merge "Fix cache flush always causing response change" am: e0f07a9dc1 am: 2c6d0a48f8

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

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