This reverts commit 74607dd786. Reason for revert: Continue development in T+/U Bug: 227513829 Test: cts test Ignore-AOSP-First: nearby_not_in_aosp_yet Change-Id: Ib648ed7163a2e1f11eeed3d0d3469decf64d9d86 CTS-Coverage-Bug: 205591293
74607dd786
b58df4bf13
ef37e45e8a