Merge "remount: Refactor partition filtering into helper functions." am:...

Merge "remount: Refactor partition filtering into helper functions." am: 89d84e1d am: 99e7ffc6 am: a0a81a71

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



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