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