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

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

Change-Id: I87f2d63a3d302b53bb028b2f7efa14fbe25b2837