Merge "Add NAMESPACE_NEARBY String" am: 4339e51473 am: 9bd0f75bf4 am: f58897e737 am: f4b45a5faa

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

Change-Id: I9df2cd99dd2a382ebda09e5acadb825fcc415798
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>