Bug: 322404137 Test: OTDOA test in b/322404137 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a5857c4c89f0c9cd3530d6be19e2b5fb22be925f) Merged-In: I8f5d174e04d4e0ff07263d2fc203697a6a260b09 Change-Id: I8f5d174e04d4e0ff07263d2fc203697a6a260b09