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

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

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