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

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

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