Resolve API council feedback

Test: built and verified logs
Fix: 225116248
Ignore-AOSP-First: nearby_not_in_aosp_yet
Change-Id: Ic30aee650fd41287d3a363491fa602cd990467a8
4 files changed