Merge changes from topic "dsu-overlayfs" am: 65f4f4359d am: 7d485cec05

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1476596

Change-Id: I39947f6add6970db9ba456a4681357d4ccadcc38