Merge "[MS06] Add carrier template fields into cloud backup/restore" am: bf424ed534 am: 3ac404a52d am: 2a239d2ae6

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1892336

Change-Id: Ibfb26963222568f64670c4bc3983c242a8595a28