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

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



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