[automerger skipped] Merge "Update the documentation of ANDROID_RESOLV_NO_CACHE_STORE" am: 99f85854bc am: a664380e81 -s ours

am skip reason: Change-Id Ia1402a18d6d466ffbb0357127d7d45cf6c722550 with SHA-1 f1cf6a632d is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1348585

Change-Id: Ic22cf07014bfb174a45c34fc69aaf97a0f22938e