Merge "Fix directory comparison in tryMountDataMirror" am: 156e28ff02 am: 295eed4fcb

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2107188

Change-Id: I9f58f03a99a0cea9bc9f5ab266ee5bad4a029dd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>