[automerger skipped] Merge "Add migration logic for D2D settings." am: 730f454217 am: a7ae23be9b am: 191ff293c9 -s ours am: d11b8380b2 -s ours

am skip reason: Merged-In I9351c18607b1536841287b843db425d3a95c6535 with SHA-1 a0751dac3c is already in history

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

Change-Id: I0285c19686a56795a592ae1e4a00b0786189738c