tree 23f232a2da105c20d0e288d48a455a7b812e9e43
parent d46549e189779cd3b3a38bfac3a6410ae91df1ea
parent 0d7a62d4af3f0527ecdbd24f6913ada64a671253
author Xin Li <delphij@google.com> 1623641540 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1623641540 +0000

DO NOT MERGE - Merge ab/7272582 am: d8451392ef am: 0d7a62d4af

Original change: https://android-review.googlesource.com/c/platform/packages/providers/TelephonyProvider/+/1735993

Change-Id: Id2403ae80e4bd520718cf9bc96ebb84dd710651d