tree b60501963081991b884f54f4e541c5d758549afc
parent 6946d9219c8f5c2f468302693b710683121c9eae
parent e260d06a6212f46b0482d42007e112bf42ae60d1
author Grace Jia <xiaotonj@google.com> 1620082149 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1620082149 +0000

[automerger skipped] Merge "Add support for D2D sharing contacts settings." am: 2b1353c909 am: 41b1bd1507 am: e260d06a62 -s ours

am skip reason: Merged-In I30330c568e577baa8d0f5f8982517ef8918ed9c9 with SHA-1 3eb232cfc9 is already in history

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

Change-Id: I9cde48686a96c55e75adcb99333fc8b4f2981c9a