[automerger skipped] Merge "Split MOUNT_FLAG_VISIBLE into...

[automerger skipped] Merge "Split MOUNT_FLAG_VISIBLE into MOUNT_FLAG_VISIBLE_FOR_{READ, WRITE}" am: b6f19328 am: 5dc7e50d am: 66536ae4 am: bc6e2940 -s ours

am skip reason: Merged-In I576430680620363f4fbe49787035bd52445b3554 with SHA-1 9c0b284b is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1891615

Change-Id: I1a71ea0c638cc70c3b744670ca4cb57dea622ba5