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

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

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



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