tree b60501963081991b884f54f4e541c5d758549afc
parent 5c6c5c40ca8eecb4133ad32efa68256971bb1609
parent e4746bb624536eebd4243a7e235f32049df275aa
author Grace Jia <xiaotonj@google.com> 1620082600 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1620082600 +0000

[automerger skipped] Merge "Add support for D2D sharing contacts settings." am: 2b1353c909 am: 41b1bd1507 am: e260d06a62 -s ours am: e4746bb624 -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: I7efe6bab7f7fa18ab3222b1e4e75b41312ecbe34