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

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

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