[automerger skipped] Merge "Update the documentation of...

[automerger skipped] Merge "Update the documentation of ANDROID_RESOLV_NO_CACHE_STORE" am: 99f85854 am: a664380e -s ours am: b79d7daf -s ours am: 75554313 -s ours am: 69a531be -s ours

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

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

Change-Id: I69f54e9c7a9b9f3098ca07069781ad5987bfefb0