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

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

Change-Id: Ie8589e8b2a82f116f9266fc874991ea60c795e83