Fix: 313884732
Ignore-AOSP-First: nearby_not_in_aosp_yet
Test: -m
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:523eeb3c87bd8f6d353d439120545566f94aaf4c)
Merged-In: Iaaca422cb105c00ded1d84b40afd745abcd651b7
Change-Id: Iaaca422cb105c00ded1d84b40afd745abcd651b7