tree ea65802d5fe3a3ccacf38987986062e6161c9700
parent 82d26c50a4db4f51e0d75bbbc4ed725fe6ec497f
parent 41b1bd150759ab8b068af51641d0f0bf3b65e816
author Grace Jia <xiaotonj@google.com> 1620081055 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1620081055 +0000

Merge "Add support for D2D sharing contacts settings." am: 2b1353c909 am: 41b1bd1507

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

Change-Id: I69463956ee933deaade73766910cdd41fdcad5d5