Merge "Bugfix Bug:236789888 Test: unit test Ignore-AOSP-First: nearby_not_in_aosp_yet" into tm-mainline-prod