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 am: a92318c2

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



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