Merge "Add ::1 to localhost in etc/hosts" am: f7a95c87 am: 7879a8e0

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2291455



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