[automerger skipped] Merge "Set data_roaming property default false in TelephonyProperties" am: fb895c39f2 am: ad32ff7db3 am: 6be423b751 -s ours am: 05c8a524bc -s ours

am skip reason: Change-Id Iaeadaf0a80aaf8345f490c824aa22fd8f9b4f6fb with SHA-1 1d84a0e7ca is in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1370477

Change-Id: Ib5f505020a0b3e04477c2d3f29051691a9519b40