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

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

Change-Id: I35ed94b6fd27515f73388fb85d98479d7ec58901