tree 2df2f6759a71cc0a513b76064a67c595f2bfa21e
parent e6dd1b01db9b41533d8f139011e0c937b013c455
parent 56f293dba5c9c7319e5e544b69e065609f9c187b
author Xinyi Zhou <zxy@google.com> 1643638891 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1643638891 +0000

Add NearbyService am: 17c5caf93e am: 56f293dba5

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

Change-Id: I4c0cf2ee03d702af1274cb13b4c79b1c20406e39