ce7867d377
Bug: 222766399 Test: make, atest TelephonyLocationTests, manual Change-Id: Id277d16aceb58324ec70eadfcd3fb871821707c9 Merged-In: Id277d16aceb58324ec70eadfcd3fb871821707c9 (cherry picked from commit 22ca59c42b52d8b8c02429cfbc4717bb55a58fda)