Merge "fs_mgr: Use /proc/mounts to check if /cache is mounted" into main am:...

Merge "fs_mgr: Use /proc/mounts to check if /cache is mounted" into main am: 7881073e am: ed0de0be

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



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