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

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

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