[automerger skipped] Merge "Fixed LocaleTracker behaviors" am: ef1fe5db am:...

[automerger skipped] Merge "Fixed LocaleTracker behaviors" am: ef1fe5db am: 5efc0aed am: 54da61ff -s ours am: 1d203f8b -s ours am: cd6d424d -s ours

am skip reason: Merged-In Ie3ec6768ffe924dd0be3e91a64dac32dacebe50b with SHA-1 447f714e is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1698165

Change-Id: Ica0efe5c5417912f149c0b7df54257fc8649e527