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

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

Change-Id: I65e9824a56727bd6a2386b2c6407fe407060d43c
tree: e1b09c152502ac800f813faaf270b1ae36bdb942
  1. core/
  2. services/