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