[automerger skipped] Work around an lldb bug with "localhost". am: bc119c2898 -s ours

am skip reason: Merged-In I3414201712ffe0f808899e2a2f206e813bb609a7 with SHA-1 fc6da790d9 is already in history

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

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