Merge "Add root directory when copying owner file." am: 1b1e747351

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

Change-Id: I86a381176e9f7296bd94e0cb34ca70d525e69062