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

Change-Id: Iaa733d0c261cc2ef62fed518276d8d2ac7f240b7