Merge "Work around an lldb bug with "localhost"." am: d70c7045c1

Original change: https://android-review.googlesource.com/c/platform/development/+/2125714

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