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

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

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