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

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

Change-Id: Id8b68781d6111c464010b91dd5548d444d4a3d60