Merge "Update test using FullBackupDataOutput private ctor" into oc-dev am: ba291f28ce
am: 29ea757f24

Change-Id: I61edfee428bf1cc4d0b86a2e0713e1ef6c30b3ee