Merge changes from topic "nearby_api_5" into tm-mainline-prod am: e44aae5b

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17355055

Change-Id: I9ca3a6d0dc1a0d576206d7a9c5144994686e10a1