[automerger skipped] Merge "[DO NOT MERGE] Scan and notify apps when their...

[automerger skipped] Merge "[DO NOT MERGE] Scan and notify apps when their companion devices are nearby" into sc-dev am: 2d29d34f -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5536f2a917461ac87ffcd9620a581bc26bc700b9