Merge "Try to remount mounted points only" am: 33d15ca2ce

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3f948cbdae2d83f50a5336b6761db143361e8b29