Merge "Add a field for transport properties to RestoreSet object" into sc-dev am: 5db986d7 am: 9923ded8

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

Change-Id: I6adc8d78d0124e073b2908e5c9bb3bab82e4e5ba