Merge "Add root directory when copying owner file." am: 1b1e747351 am: 792682ada2 am: 4145b1e2ef

Original change: https://android-review.googlesource.com/c/platform/development/+/1971199

Change-Id: I6fb96b3ad0a929d3fa2da391fce80b3d7b85849d