Merge "fs_mgr: adb-remount-test.sh: filter out more administrivia mounts." am:...

Merge "fs_mgr: adb-remount-test.sh: filter out more administrivia mounts." am: 5f7c13fb am: 5d0170c8

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

Change-Id: I17aab28f665aeccf9dfeeaa719e0085621a003af