[automerger skipped] Merge "OOB: Implement getLocalOutOfBand API" am: c1349d4c56 am: 0087b62300 am: a11cd96d52 -s ours

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

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

Change-Id: Ibc856f26545ba3e148adac919e4f1b17b4a5a7df