Merge "Migrate mount/umount operations to a dedicated mMountsLock." am: b78dbeae20 am: 4b9691c727

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1897160

Change-Id: Id96a1dd871f95385fd2d621d1ffcacedd0c17213