Merge "Fix local service binding in tests." am: 6d0bf150e3 am: fe54088dcb

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624867

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7767b6abb495a5c3e96cc991b18bbd4647b4ef70