Merge "adb-remount-test: Only test mounts that are remounted by us" into main...

Merge "adb-remount-test: Only test mounts that are remounted by us" into main am: 951ffacc am: 9fb26efb

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



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