[automerger skipped] Merge "OOB: Implement getLocalOutOfBand API" am:...

[automerger skipped] Merge "OOB: Implement getLocalOutOfBand API" am: c1349d4c am: 0087b623 am: a11cd96d -s ours am: c2e66f44 -s ours

am skip reason: skip tag Change-Id I5bc11ac13d9cbb8f76f422aa4aea8295ebec95b4 with SHA-1 2093f697 is already in history

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

Change-Id: I9c3a201aa665fef2eed3ec049a3aa381fcfbca86